From 39b9f8fa6b3c9683db9d92f683c23548de57f94d Mon Sep 17 00:00:00 2001
From: oliver <oliver@localhost>
Date: Sun, 19 Apr 2015 14:20:10 +0200
Subject: [PATCH] ask for confirmation for moving Questgroups (issue #88)

---
 agents/intermediate/QuestgroupsAgent.inc    |  24 +++++
 controllers/QuestgroupsController.inc       | 100 ++++++++++++++------
 locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 25673 -> 25931 bytes
 locale/de_DE/LC_MESSAGES/The Legend of Z.po |  48 ++++++----
 views/html/questgroups/movedown.tpl         |  19 ++++
 views/html/questgroups/moveup.tpl           |  19 ++++
 6 files changed, 165 insertions(+), 45 deletions(-)

diff --git a/agents/intermediate/QuestgroupsAgent.inc b/agents/intermediate/QuestgroupsAgent.inc
index 2d2a4996..7f71eafa 100644
--- a/agents/intermediate/QuestgroupsAgent.inc
+++ b/agents/intermediate/QuestgroupsAgent.inc
@@ -59,6 +59,30 @@
 		}
 		
 
+		/**
+		 * Action: moveup.
+		 * 
+		 * @param	\nre\core\Request	$request	Current request
+		 * @param	\nre\core\Response	$response	Current response
+		 */
+		public function moveup(\nre\core\Request $request, \nre\core\Response $response)
+		{
+			$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4));
+		}
+
+
+		/**
+		 * Action: movedown.
+		 * 
+		 * @param	\nre\core\Request	$request	Current request
+		 * @param	\nre\core\Response	$response	Current response
+		 */
+		public function movedown(\nre\core\Request $request, \nre\core\Response $response)
+		{
+			$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4));
+		}
+
+
 		/**
 		 * Action: delete.
 		 * 
diff --git a/controllers/QuestgroupsController.inc b/controllers/QuestgroupsController.inc
index 0f601060..08f32132 100644
--- a/controllers/QuestgroupsController.inc
+++ b/controllers/QuestgroupsController.inc
@@ -580,22 +580,44 @@
 			$questgroup = $this->Questgroups->getQuestgroupByUrl($seminary['id'], $questgroupUrl);
 			$questgroup['hierarchy'] = $this->Questgroupshierarchy->getHierarchyForQuestgroup($questgroup['id']);
 			
-			// Set position
-			$this->Questgroups->moveQuestgroup($questgroup, true);
-
-
-			// Redirect
-			$referer = $this->request->getGetParam('referer');
-			if(!is_null($referer))
+			// Check request method
+			if($this->request->getRequestMethod() == 'POST')
 			{
-				try {
-					$questgroup = $this->Questgroups->getQuestgroupById($referer);
-					$this->redirect($this->linker->link(array('questgroups', 'questgroup', $seminary['url'], $questgroup['url'])));
-				}
-				catch(IdNotFoundException $e) {
-				}
+				// Check confirmation
+				if(!is_null($this->request->getPostParam('move')))
+				{
+                    // Set position
+                    $this->Questgroups->moveQuestgroup($questgroup, true);
+                }
+
+                // Redirect
+                $referer = $this->request->getGetParam('referer');
+                if(!is_null($referer))
+                {
+                    try {
+                        $questgroup = $this->Questgroups->getQuestgroupById($referer);
+                        $this->redirect($this->linker->link(array('questgroups', 'questgroup', $seminary['url'], $questgroup['url'])));
+                    }
+                    catch(IdNotFoundException $e) {
+                    }
+                }
+                $this->redirect($this->linker->link(array('seminaries', 'seminary', $seminary['url'])));
+            }
+
+			// Media
+			$picture = null;
+			if(!is_null($questgroup['questgroupspicture_id'])) {
+				$picture = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']);
 			}
-			$this->redirect($this->linker->link(array('seminaries', 'seminary', $seminary['url'])));
+			
+			
+			// Set titile
+			$this->addTitleLocalized('Move Questgroup');
+			
+			// Show confirmation
+			$this->set('seminary', $seminary);
+			$this->set('questgroup', $questgroup);
+			$this->set('picture', $picture);
 		}
 
 
@@ -617,22 +639,44 @@
 			$questgroup = $this->Questgroups->getQuestgroupByUrl($seminary['id'], $questgroupUrl);
 			$questgroup['hierarchy'] = $this->Questgroupshierarchy->getHierarchyForQuestgroup($questgroup['id']);
 			
-			// Set position
-			$this->Questgroups->moveQuestgroup($questgroup, false);
-
-
-			// Redirect
-			$referer = $this->request->getGetParam('referer');
-			if(!is_null($referer))
+			// Check request method
+			if($this->request->getRequestMethod() == 'POST')
 			{
-				try {
-					$questgroup = $this->Questgroups->getQuestgroupById($referer);
-					$this->redirect($this->linker->link(array('questgroups', 'questgroup', $seminary['url'], $questgroup['url'])));
-				}
-				catch(IdNotFoundException $e) {
-				}
+				// Check confirmation
+				if(!is_null($this->request->getPostParam('move')))
+				{
+                    // Set position
+                    $this->Questgroups->moveQuestgroup($questgroup, false);
+                }
+
+                // Redirect
+                $referer = $this->request->getGetParam('referer');
+                if(!is_null($referer))
+                {
+                    try {
+                        $questgroup = $this->Questgroups->getQuestgroupById($referer);
+                        $this->redirect($this->linker->link(array('questgroups', 'questgroup', $seminary['url'], $questgroup['url'])));
+                    }
+                    catch(IdNotFoundException $e) {
+                    }
+                }
+                $this->redirect($this->linker->link(array('seminaries', 'seminary', $seminary['url'])));
+            }
+
+			// Media
+			$picture = null;
+			if(!is_null($questgroup['questgroupspicture_id'])) {
+				$picture = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']);
 			}
-			$this->redirect($this->linker->link(array('seminaries', 'seminary', $seminary['url'])));
+			
+			
+			// Set titile
+			$this->addTitleLocalized('Move Questgroup');
+			
+			// Show confirmation
+			$this->set('seminary', $seminary);
+			$this->set('questgroup', $questgroup);
+			$this->set('picture', $picture);
 		}
 
 
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 4bf816844a5f090441e10674ae733bd87e91aaf1..2f802ca9b240c043c37c77d5b775d9306eeb3d96 100644
GIT binary patch
delta 8477
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
TOXV}ND{2Pa(6A(H(v|-K?~r-H

delta 8301
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
BP&ohq

diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.po b/locale/de_DE/LC_MESSAGES/The Legend of Z.po
index fe0defe3..b8f9924c 100644
--- a/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
+++ b/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Legend of Z\n"
-"POT-Creation-Date: 2015-04-19 12:49+0100\n"
-"PO-Revision-Date: 2015-04-19 12:50+0100\n"
+"POT-Creation-Date: 2015-04-19 14:15+0100\n"
+"PO-Revision-Date: 2015-04-19 14:16+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -104,7 +104,7 @@ msgstr ""
 #: questtypes/multiplechoice/html/edittask.tpl:79
 #: questtypes/textinput/html/edittask.tpl:44
 #: views/html/achievements/conditions.tpl:151
-#: views/html/achievements/edit.tpl:112 views/html/charactertypes/edit.tpl:124
+#: views/html/achievements/edit.tpl:112 views/html/charactertypes/edit.tpl:142
 #: views/html/library/edit.tpl:46 views/html/library/edit.tpl:86
 #: views/html/quests/edit.tpl:114 views/html/users/edit.tpl:109
 #: views/html/xplevels/manage.tpl:49
@@ -258,7 +258,7 @@ msgstr "Fehler beim Dateiupload: %s"
 #: views/html/charactergroupsquests/create.tpl:66
 #: views/html/charactergroupsquests/edit.tpl:67
 #: views/html/charactergroupsquests/manage.tpl:72
-#: views/html/charactertypes/edit.tpl:117 views/html/questgroups/create.tpl:65
+#: views/html/charactertypes/edit.tpl:135 views/html/questgroups/create.tpl:65
 #: views/html/questgroups/edit.tpl:53 views/html/quests/create.tpl:62
 #: views/html/quests/edit.tpl:65 views/html/seminaries/create.tpl:60
 #: views/html/seminaries/edit.tpl:62
@@ -272,7 +272,7 @@ msgstr "Erlaubte Dateiformate"
 #: views/html/charactergroupsquests/create.tpl:69
 #: views/html/charactergroupsquests/edit.tpl:70
 #: views/html/charactergroupsquests/manage.tpl:72
-#: views/html/charactertypes/edit.tpl:120 views/html/questgroups/create.tpl:68
+#: views/html/charactertypes/edit.tpl:138 views/html/questgroups/create.tpl:68
 #: views/html/questgroups/edit.tpl:56 views/html/quests/create.tpl:65
 #: views/html/quests/edit.tpl:68 views/html/seminaries/create.tpl:63
 #: views/html/seminaries/edit.tpl:65
@@ -287,7 +287,7 @@ msgstr "%s-Dateien"
 #: views/html/charactergroupsquests/create.tpl:69
 #: views/html/charactergroupsquests/edit.tpl:70
 #: views/html/charactergroupsquests/manage.tpl:72
-#: views/html/charactertypes/edit.tpl:120 views/html/questgroups/create.tpl:68
+#: views/html/charactertypes/edit.tpl:138 views/html/questgroups/create.tpl:68
 #: views/html/questgroups/edit.tpl:56 views/html/quests/create.tpl:65
 #: views/html/quests/edit.tpl:68 views/html/seminaries/create.tpl:63
 #: views/html/seminaries/edit.tpl:65
@@ -742,6 +742,7 @@ msgstr "Soll das Achievement „%s“ wirklich gelöscht werden?"
 #: views/html/charactergroupsquests/delete.tpl:16
 #: views/html/characters/delete.tpl:18 views/html/charactertypes/delete.tpl:15
 #: views/html/library/delete.tpl:15 views/html/questgroups/delete.tpl:18
+#: views/html/questgroups/movedown.tpl:18 views/html/questgroups/moveup.tpl:18
 #: views/html/questgroupshierarchy/delete.tpl:15
 #: views/html/quests/delete.tpl:12 views/html/seminaries/delete.tpl:14
 #: views/html/users/delete.tpl:12
@@ -1241,7 +1242,7 @@ msgstr "Fortschritt"
 #: views/html/characters/character.tpl:83
 #: views/html/characters/character.tpl:97
 #: views/html/characters/character.tpl:109
-#: views/html/charactertypes/edit.tpl:103 views/html/seminarybar/index.tpl:49
+#: views/html/charactertypes/edit.tpl:115 views/html/seminarybar/index.tpl:49
 #: views/html/users/user.tpl:42 views/html/xplevels/manage.tpl:41
 msgid "Level"
 msgstr "Level"
@@ -1405,47 +1406,47 @@ msgstr "Characterrasse bearbeiten"
 msgid "Avatars"
 msgstr "Avatare"
 
-#: views/html/charactertypes/edit.tpl:60
+#: views/html/charactertypes/edit.tpl:69
 #, php-format
 msgid "Error during avatar portrait upload: %s"
 msgstr "Fehler beim Upload des Avatarportraits: %s"
 
-#: views/html/charactertypes/edit.tpl:62
+#: views/html/charactertypes/edit.tpl:71
 #, php-format
 msgid "Avatar portrait has wrong type “%s”"
 msgstr "Der Dateityp „%s“ ist für Avatarportraits nicht erlaubt"
 
-#: views/html/charactertypes/edit.tpl:64
+#: views/html/charactertypes/edit.tpl:73
 msgid "Avatar portrait exceeds size maximum"
 msgstr "Das Avatarportrait ist zu groß"
 
-#: views/html/charactertypes/edit.tpl:66
+#: views/html/charactertypes/edit.tpl:75
 msgid "Avatar portrait invalid"
 msgstr "Das Avatarportrait ist ungültig"
 
-#: views/html/charactertypes/edit.tpl:85
+#: views/html/charactertypes/edit.tpl:95
 #, php-format
 msgid "Error during avatar upload: %s"
 msgstr "Fehler beim Upload des Avatars: %s"
 
-#: views/html/charactertypes/edit.tpl:87
+#: views/html/charactertypes/edit.tpl:97
 #, php-format
 msgid "Avatar has wrong type “%s”"
 msgstr "Der Dateityp „%s“ ist für Avatare nicht erlaubt"
 
-#: views/html/charactertypes/edit.tpl:89
+#: views/html/charactertypes/edit.tpl:99
 msgid "Avatar exceeds size maximum"
 msgstr "Der Avatar ist zu groß"
 
-#: views/html/charactertypes/edit.tpl:91
+#: views/html/charactertypes/edit.tpl:101
 msgid "Avatar invalid"
 msgstr "Der Avatar ist ungültig"
 
-#: views/html/charactertypes/edit.tpl:107
+#: views/html/charactertypes/edit.tpl:118
 msgid "Protrait"
 msgstr "Portrait"
 
-#: views/html/charactertypes/edit.tpl:112
+#: views/html/charactertypes/edit.tpl:125
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -1660,6 +1661,19 @@ msgstr "Questgruppetexte bearbeiten"
 msgid "New Questgroup text"
 msgstr "Neuer Questgruppentext"
 
+#: views/html/questgroups/movedown.tpl:14 views/html/questgroups/moveup.tpl:14
+msgid "Move Questgroup"
+msgstr "Questgroup verschieben"
+
+#: views/html/questgroups/movedown.tpl:15 views/html/questgroups/moveup.tpl:15
+#, php-format
+msgid "Should the Questgroup “%s” really be moved?"
+msgstr "Soll die Questgruppe „%s“ wirklich verschoben werden?"
+
+#: views/html/questgroups/movedown.tpl:17 views/html/questgroups/moveup.tpl:17
+msgid "move"
+msgstr "verschieben"
+
 #: views/html/questgroups/questgroup.tpl:22
 msgid "Create new Quest"
 msgstr "Neue Quest erstellen"
diff --git a/views/html/questgroups/movedown.tpl b/views/html/questgroups/movedown.tpl
index e69de29b..4d265c95 100644
--- a/views/html/questgroups/movedown.tpl
+++ b/views/html/questgroups/movedown.tpl
@@ -0,0 +1,19 @@
+<?php if(!is_null($picture)) : ?>
+<div class="moodpic">
+	<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$picture['url']))?>" />
+</div>
+<?php endif ?>
+<?=$questgroupshierarchypath?>
+
+<?php if(!is_null($questgroup['hierarchy'])) : ?>
+<h1><?=$questgroup['hierarchy']['title_singular']?> <?=$questgroup['hierarchy']['questgroup_pos']?>: <?=$questgroup['title']?></h1>
+<?php else : ?>
+<h1><?=$questgroup['title']?></h1>
+<?php endif ?>
+
+<h1><?=_('Move Questgroup')?></h1>
+<?=sprintf(_('Should the Questgroup “%s” really be moved?'), $questgroup['title'])?>
+<form method="post">
+	<input type="submit" name="move" value="<?=_('move')?>" />
+	<input type="submit" name="not-move" value="<?=_('cancel')?>" />
+</form>
diff --git a/views/html/questgroups/moveup.tpl b/views/html/questgroups/moveup.tpl
index e69de29b..4d265c95 100644
--- a/views/html/questgroups/moveup.tpl
+++ b/views/html/questgroups/moveup.tpl
@@ -0,0 +1,19 @@
+<?php if(!is_null($picture)) : ?>
+<div class="moodpic">
+	<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$picture['url']))?>" />
+</div>
+<?php endif ?>
+<?=$questgroupshierarchypath?>
+
+<?php if(!is_null($questgroup['hierarchy'])) : ?>
+<h1><?=$questgroup['hierarchy']['title_singular']?> <?=$questgroup['hierarchy']['questgroup_pos']?>: <?=$questgroup['title']?></h1>
+<?php else : ?>
+<h1><?=$questgroup['title']?></h1>
+<?php endif ?>
+
+<h1><?=_('Move Questgroup')?></h1>
+<?=sprintf(_('Should the Questgroup “%s” really be moved?'), $questgroup['title'])?>
+<form method="post">
+	<input type="submit" name="move" value="<?=_('move')?>" />
+	<input type="submit" name="not-move" value="<?=_('cancel')?>" />
+</form>