diff options
Diffstat (limited to 'controller/foldercontroller.php')
-rw-r--r-- | controller/foldercontroller.php | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/controller/foldercontroller.php b/controller/foldercontroller.php index 7542a5260..4bae118c2 100644 --- a/controller/foldercontroller.php +++ b/controller/foldercontroller.php @@ -114,6 +114,10 @@ class FolderController extends Controller { $folderName = $this->params('folderName'); try { + // we need to purge deleted folders if a folder is created to + // prevent already exists exceptions + $this->folderBusinessLayer->purgeDeleted($userId); + $folder = $this->folderBusinessLayer->create($folderName, $userId); $params = array( @@ -138,7 +142,7 @@ class FolderController extends Controller { $folderId = (int) $this->params('folderId'); try { - $this->folderBusinessLayer->delete($folderId, $userId); + $this->folderBusinessLayer->markDeleted($folderId, $userId); return $this->renderJSON(); } catch (BusinessLayerException $ex){ return $this->renderJSON(array(), $ex->getMessage()); @@ -188,4 +192,23 @@ class FolderController extends Controller { } + /** + * @IsAdminExemption + * @IsSubAdminExemption + * @Ajax + */ + public function restore(){ + $userId = $this->api->getUserId(); + $folderId = (int) $this->params('folderId'); + + try { + $this->folderBusinessLayer->unmarkDeleted($folderId, $userId); + return $this->renderJSON(); + } catch (BusinessLayerException $ex){ + return $this->renderJSON(array(), $ex->getMessage()); + } + + } + + }
\ No newline at end of file |