diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-21 23:07:03 +0100 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-21 23:07:03 +0100 |
commit | b6adabf245fb2e32763dda43a54270eef11d3411 (patch) | |
tree | 1169c16521c05278789e22e70f88141f99d1e44d /controller | |
parent | 7ed948b19b3e705dba95bef7d4b2a8630f342e12 (diff) |
finished foldercontroller
Diffstat (limited to 'controller')
-rw-r--r-- | controller/feedcontroller.php | 4 | ||||
-rw-r--r-- | controller/foldercontroller.php | 43 |
2 files changed, 43 insertions, 4 deletions
diff --git a/controller/feedcontroller.php b/controller/feedcontroller.php index 4f7233b9f..62af79197 100644 --- a/controller/feedcontroller.php +++ b/controller/feedcontroller.php @@ -117,7 +117,7 @@ class FeedController extends Controller { $this->feedBl->delete($feedId, $userId); - return $this->renderJSON(array()); + return $this->renderJSON(); } @@ -152,7 +152,7 @@ class FeedController extends Controller { $this->feedBl->move($feedId, $parentFolderId, $userId); - return $this->renderJSON(array()); + return $this->renderJSON(); } diff --git a/controller/foldercontroller.php b/controller/foldercontroller.php index 74c872269..ec188a276 100644 --- a/controller/foldercontroller.php +++ b/controller/foldercontroller.php @@ -30,6 +30,7 @@ use \OCA\AppFramework\Core\API; use \OCA\AppFramework\Http\Request; use \OCA\News\Bl\FolderBl; +use \OCA\News\Bl\BLException; class FolderController extends Controller { @@ -70,7 +71,7 @@ class FolderController extends Controller { */ public function open(){ $this->setOpened(true); - return $this->renderJSON(array()); + return $this->renderJSON(); } @@ -81,7 +82,7 @@ class FolderController extends Controller { */ public function collapse(){ $this->setOpened(false); - return $this->renderJSON(array()); + return $this->renderJSON(); } @@ -91,6 +92,22 @@ class FolderController extends Controller { * @Ajax */ public function create(){ + $userId = $this->api->getUserId(); + $folderName = $this->params('folderName'); + + try { + $folder = $this->folderBl->create($folderName, $userId); + + $params = array( + 'folders' => array($folder) + ); + return $this->renderJSON($params); + + } catch (BLException $ex){ + + return $this->renderJSON(array(), $ex->getMessage()); + } + } @@ -100,6 +117,12 @@ class FolderController extends Controller { * @Ajax */ public function delete(){ + $userId = $this->api->getUserId(); + $folderId = $this->params('folderId'); + + $this->folderBl->delete($folderId, $userId); + + return $this->renderJSON(); } @@ -109,6 +132,22 @@ class FolderController extends Controller { * @Ajax */ public function rename(){ + $userId = $this->api->getUserId(); + $folderName = $this->params('folderName'); + $folderId = $this->params('folderId'); + + try { + $folder = $this->folderBl->rename($folderId, $folderName, $userId); + + $params = array( + 'folders' => array($folder) + ); + return $this->renderJSON($params); + + } catch (BLException $ex){ + + return $this->renderJSON(array(), $ex->getMessage()); + } } |