From c6142fb5cf4c0d8aa41053c85fa255cde51c7f06 Mon Sep 17 00:00:00 2001 From: oliver Date: Wed, 8 Apr 2015 15:57:43 +0200 Subject: [PATCH] add feature to delete media of Charactergroupsquests (implements #6) --- .../CharactergroupsquestsController.inc | 10 ++++++ locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 25233 -> 25317 bytes locale/de_DE/LC_MESSAGES/The Legend of Z.po | 33 ++++++++++------- models/UploadsModel.inc | 34 ++++++++++++++++++ views/html/charactergroupsquests/manage.tpl | 31 +++++++++------- www/css/desktop.css | 5 +++ 6 files changed, 88 insertions(+), 25 deletions(-) diff --git a/controllers/CharactergroupsquestsController.inc b/controllers/CharactergroupsquestsController.inc index 42e47e2d..f4ba8916 100644 --- a/controllers/CharactergroupsquestsController.inc +++ b/controllers/CharactergroupsquestsController.inc @@ -181,6 +181,16 @@ $this->Charactergroupsquests->uploadMediaForQuest($this->Auth->getUserId(), $seminary['id'], $quest['id'], $file, $filename); } } + + // Delete media + if(!is_null($this->request->getPostParam('deletemedia'))) + { + $uploadIds = $this->request->getPostParam('uploads'); + var_dump($uploadIds); + foreach($uploadIds as $uploadId) { + $this->Uploads->deleteSeminaryupload($uploadId); + } + } // Set XPs of Character groups for this Character groups Quest if(!is_null($this->request->getPostParam('setxps'))) diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo index 629a5b8e3e8eb752c679207111b49c52c81568fe..2e43403896dfbb5f1a0f23dd385172632a909cfa 100644 GIT binary patch delta 6397 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 + + try { + // Get Upload + $upload = $this->getSeminaryuploadById($uploadId); + + // Delete database record + $this->db->query( + 'DELETE FROM seminaryuploads '. + 'WHERE id = ?', + 'i', + $uploadId + ); + + // Delete file + $filename = ROOT.DS.\nre\configs\AppConfig::$dirs['seminaryuploads'].DS.$upload['url']; + unlink($filename); + } + catch(\nre\exceptions\DatamodelException $e) { + $this->db->rollback(); + $this->db->setAutocommit(true); + } + + $this->db->setAutocommit(true); + } } diff --git a/views/html/charactergroupsquests/manage.tpl b/views/html/charactergroupsquests/manage.tpl index ada60330..126f8878 100644 --- a/views/html/charactergroupsquests/manage.tpl +++ b/views/html/charactergroupsquests/manage.tpl @@ -51,19 +51,26 @@ - -

: 0) : ?>(  MiB)

-
+ +
    + +
  • + +
    +
  • + +
+ +
+

- +

: 0) : ?>(  MiB)

+
diff --git a/www/css/desktop.css b/www/css/desktop.css index f60c060c..9125f7c9 100644 --- a/www/css/desktop.css +++ b/www/css/desktop.css @@ -461,3 +461,8 @@ aside .cranks li:nth-child(odd){background:#f7f5f2} div.cond{display:none;margin-left:15px} input[type="checkbox"]:checked + label + div.cond{display:block} +form.mng{margin:30px 0} +form.mng p{margin:0} +form.mng ul{margin:0} +form.mng input[type="submit"]{margin:0} +.mnglst li{text-align:center}