From 74b093a61fc6e0d517eafec99e80f6a639ca8ce6 Mon Sep 17 00:00:00 2001 From: oliver Date: Sat, 26 Mar 2016 19:15:02 +0100 Subject: [PATCH] add ?public? option for Character groups Quests (implements #146) --- .../CharactergroupsquestsController.inc | 6 +- db/create.sql | 3 +- locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 31038 -> 31073 bytes locale/de_DE/LC_MESSAGES/The Legend of Z.po | 122 +++++++++--------- models/CharactergroupsquestsModel.inc | 38 +++--- views/html/charactergroups/groupsgroup.tpl | 2 + views/html/charactergroupsquests/edit.tpl | 2 + 7 files changed, 94 insertions(+), 79 deletions(-) diff --git a/controllers/CharactergroupsquestsController.inc b/controllers/CharactergroupsquestsController.inc index 5bd3c2ef..332a0dc6 100644 --- a/controllers/CharactergroupsquestsController.inc +++ b/controllers/CharactergroupsquestsController.inc @@ -535,6 +535,7 @@ $rules = $quest['rules']; $wonText = $quest['won_text']; $lostText = $quest['lost_text']; + $public = $quest['public']; $fields = array('title', 'xps'); $validation = array(); @@ -552,6 +553,7 @@ $rules = $this->request->getPostParam('rules'); $wonText = $this->request->getPostParam('wonText'); $lostText = $this->request->getPostParam('lostText'); + $public = !is_null($this->request->getPostParam('public')); // Validate icon $icon = null; @@ -606,7 +608,8 @@ $xps, $rules, $wonText, - $lostText + $lostText, + $public ); $quest = $this->Charactergroupsquests->getQuestById($quest['id']); @@ -654,6 +657,7 @@ $this->set('rules', $rules); $this->set('wonText', $wonText); $this->set('lostText', $lostText); + $this->set('public', $public); $this->set('mimetypes', $mimetypes); $this->set('validation', $validation); $this->set('validationSettings', $validationSettings); diff --git a/db/create.sql b/db/create.sql index caf94791..d695be29 100644 --- a/db/create.sql +++ b/db/create.sql @@ -508,6 +508,7 @@ CREATE TABLE `charactergroupsquests` ( `won_text` text COLLATE utf8mb4_unicode_ci NOT NULL, `lost_text` text COLLATE utf8mb4_unicode_ci NOT NULL, `questsmedia_id` int(11) DEFAULT NULL, + `public` tinyint(1) NOT NULL DEFAULT '1', PRIMARY KEY (`id`), UNIQUE KEY `charactergroupsgroup_id_2` (`charactergroupsgroup_id`,`url`), KEY `created_user_id` (`created_user_id`), @@ -2662,4 +2663,4 @@ DELIMITER ; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2016-03-26 16:16:45 +-- Dump completed on 2016-03-26 19:13:31 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 5d8359a7956bff0a44eed00a225ae6b5dc004c4c..10d06a7ed7fad85a604f9ea5d8c03068d90f24ac 100644 GIT binary patch delta 7736 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%0DQ=)@USaiC4m zdLH`WD#4~WFn*ql#!@hn$>^b)j~<#On2isF=g*@ne-j(wRlIZG9{Tr`?!CHot?oUn$U?=2DZ}zQRNuGYz<&UP CnvLcF 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 c89e167a..ba36f3a7 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: 2016-03-26 17:43+0100\n" -"PO-Revision-Date: 2016-03-26 17:45+0100\n" +"POT-Creation-Date: 2016-03-26 19:10+0100\n" +"PO-Revision-Date: 2016-03-26 19:10+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: de_DE\n" @@ -18,12 +18,12 @@ msgstr "" "X-Poedit-SearchPath-2: controllers\n" #: controllers/CharactergroupsachievementsController.inc:175 -#: views/html/charactergroups/groupsgroup.tpl:50 +#: views/html/charactergroups/groupsgroup.tpl:52 #, php-format msgid "%s-Achievements" msgstr "%sachievements" -#: controllers/CharactersController.inc:417 controllers/UsersController.inc:339 +#: controllers/CharactersController.inc:438 controllers/UsersController.inc:339 #: views/ajax/characters/index.tpl:10 views/ajax/users/index.tpl:10 #: views/html/characters/index.tpl:45 views/html/characters/manage.tpl:33 #: views/html/characters/manage.tpl:48 views/html/characters/manage.tpl:56 @@ -33,7 +33,7 @@ msgstr "%sachievements" msgid "Admin" msgstr "Administrator" -#: controllers/CharactersController.inc:423 controllers/UsersController.inc:345 +#: controllers/CharactersController.inc:444 controllers/UsersController.inc:345 #: views/ajax/characters/index.tpl:12 views/ajax/users/index.tpl:12 #: views/html/characters/index.tpl:46 views/html/characters/manage.tpl:34 #: views/html/characters/manage.tpl:49 views/html/characters/manage.tpl:57 @@ -43,7 +43,7 @@ msgstr "Administrator" msgid "Moderator" msgstr "Moderator" -#: controllers/CharactersController.inc:429 controllers/UsersController.inc:351 +#: controllers/CharactersController.inc:450 controllers/UsersController.inc:351 #: views/ajax/characters/index.tpl:14 views/ajax/users/index.tpl:14 #: views/html/characters/index.tpl:47 views/html/characters/manage.tpl:35 #: views/html/characters/manage.tpl:51 views/html/characters/manage.tpl:59 @@ -514,20 +514,20 @@ msgid "Questtype textinput" msgstr "Texteingabe" #: views/ajax/quests/index.tpl:29 views/html/charactergroups/group.tpl:29 -#: views/html/charactergroups/group.tpl:42 +#: views/html/charactergroups/group.tpl:49 #: views/html/charactergroupsquests/manage.tpl:17 #: views/html/charactergroupsquests/manage.tpl:85 #: views/html/charactergroupsquests/quest.tpl:21 #: views/html/charactergroupsquests/quest.tpl:167 -#: views/html/characters/character.tpl:81 -#: views/html/characters/character.tpl:83 -#: views/html/characters/character.tpl:95 -#: views/html/characters/character.tpl:97 -#: views/html/characters/character.tpl:107 -#: views/html/characters/character.tpl:109 -#: views/html/characters/character.tpl:125 views/html/quests/index.tpl:71 -#: views/html/seminaries/index.tpl:27 views/html/seminarybar/index.tpl:11 -#: views/html/seminarybar/index.tpl:49 views/html/seminarybar/index.tpl:51 +#: views/html/characters/character.tpl:90 +#: views/html/characters/character.tpl:92 +#: views/html/characters/character.tpl:110 +#: views/html/characters/character.tpl:112 +#: views/html/characters/character.tpl:128 +#: views/html/characters/character.tpl:130 +#: views/html/characters/character.tpl:146 views/html/quests/index.tpl:71 +#: views/html/seminaries/index.tpl:27 views/html/seminarybar/index.tpl:14 +#: views/html/seminarybar/index.tpl:57 views/html/seminarybar/index.tpl:59 #, php-format msgid "%d XPs" msgstr "%d XP" @@ -545,7 +545,7 @@ msgstr "Fehler" #: views/html/achievements/conditions.tpl:4 #: views/html/achievements/create.tpl:4 views/html/achievements/delete.tpl:4 #: views/html/achievements/edit.tpl:4 views/html/achievements/index.tpl:12 -#: views/html/achievements/manage.tpl:4 views/html/charactergroups/group.tpl:65 +#: views/html/achievements/manage.tpl:4 views/html/charactergroups/group.tpl:72 #: views/html/seminaries/copy.tpl:103 views/html/seminarymenu/index.tpl:6 msgid "Achievements" msgstr "Achievements" @@ -628,8 +628,8 @@ msgid "Group by" msgstr "Gruppiert über" #: views/html/achievements/conditions.tpl:65 -#: views/html/achievements/conditions.tpl:136 views/html/html.tpl:82 -#: views/html/html.tpl:94 +#: views/html/achievements/conditions.tpl:136 views/html/html.tpl:85 +#: views/html/html.tpl:97 msgid "Achievement" msgstr "Achievement" @@ -808,8 +808,8 @@ msgstr "Erhalten" #: views/html/charactergroupsachievements/edit.tpl:65 #: views/html/charactergroupsquests/create.tpl:70 #: views/html/charactergroupsquests/create.tpl:71 -#: views/html/charactergroupsquests/edit.tpl:71 -#: views/html/charactergroupsquests/edit.tpl:72 +#: views/html/charactergroupsquests/edit.tpl:73 +#: views/html/charactergroupsquests/edit.tpl:74 #: views/html/charactergroupsqueststations/create.tpl:83 #: views/html/charactergroupsqueststations/create.tpl:84 #: views/html/charactergroupsqueststations/edit.tpl:83 @@ -836,8 +836,8 @@ msgstr "Titel" #: views/html/charactergroupsachievements/edit.tpl:66 #: views/html/charactergroupsquests/create.tpl:80 #: views/html/charactergroupsquests/create.tpl:81 -#: views/html/charactergroupsquests/edit.tpl:81 -#: views/html/charactergroupsquests/edit.tpl:82 +#: views/html/charactergroupsquests/edit.tpl:83 +#: views/html/charactergroupsquests/edit.tpl:84 #: views/html/charactergroupsquests/quest.tpl:41 #: views/html/seminaries/copy.tpl:69 views/html/seminaries/copy.tpl:70 #: views/html/seminaries/create.tpl:70 views/html/seminaries/create.tpl:71 @@ -980,7 +980,7 @@ msgstr "Persönlicher Fortschritt: %d%%" #: views/html/achievements/index.tpl:61 views/html/charactergroups/group.tpl:28 #: views/html/charactergroups/managegroup.tpl:16 -#: views/html/characters/character.tpl:44 views/html/seminarybar/index.tpl:12 +#: views/html/characters/character.tpl:47 views/html/seminarybar/index.tpl:15 msgid "Rank" msgstr "Platz" @@ -989,8 +989,8 @@ msgstr "Platz" msgid "You achieved %d of %d Achievements so far" msgstr "Du hast bislang %d von insgesamt %d Achievements erreicht" -#: views/html/achievements/index.tpl:68 views/html/charactergroups/group.tpl:79 -#: views/html/seminarybar/index.tpl:33 +#: views/html/achievements/index.tpl:68 views/html/charactergroups/group.tpl:86 +#: views/html/seminarybar/index.tpl:36 #, php-format msgid "achieved at: %s" msgstr "erhalten am: %s" @@ -1003,7 +1003,7 @@ msgstr "Spiele weiter, um diesen geheimen Erfolg freizuschalten" #: views/html/charactergroups/editgroup.tpl:79 #: views/html/charactergroups/editgroupsgroup.tpl:46 #: views/html/charactergroupsachievements/manage.tpl:21 -#: views/html/charactergroupsquests/edit.tpl:90 +#: views/html/charactergroupsquests/edit.tpl:92 #: views/html/charactergroupsqueststations/station.tpl:36 #: views/html/characters/edit.tpl:131 views/html/charactertitles/index.tpl:17 #: views/html/charactertypes/index.tpl:20 views/html/introduction/index.tpl:22 @@ -1039,7 +1039,7 @@ msgstr "bearbeiten" #: views/html/charactergroupsqueststations/edittask.tpl:4 #: views/html/charactergroupsqueststations/station.tpl:4 #: views/html/charactergroupsqueststations/station.tpl:136 -#: views/html/characters/character.tpl:117 views/html/seminaries/copy.tpl:105 +#: views/html/characters/character.tpl:138 views/html/seminaries/copy.tpl:105 #: views/html/seminarymenu/index.tpl:5 msgid "Character Groups" msgstr "Gruppen" @@ -1267,17 +1267,17 @@ msgstr "Mitglied" msgid "Characters" msgstr "Charaktere" -#: views/html/charactergroups/group.tpl:49 +#: views/html/charactergroups/group.tpl:56 #: views/html/charactergroups/groupsgroup.tpl:32 #, php-format msgid "%s-Quests" msgstr "%squests" -#: views/html/charactergroups/group.tpl:56 +#: views/html/charactergroups/group.tpl:63 #: views/html/charactergroupsquests/create.tpl:72 #: views/html/charactergroupsquests/create.tpl:73 -#: views/html/charactergroupsquests/edit.tpl:73 -#: views/html/charactergroupsquests/edit.tpl:74 +#: views/html/charactergroupsquests/edit.tpl:75 +#: views/html/charactergroupsquests/edit.tpl:76 #: views/html/characters/index.tpl:24 views/html/characters/index.tpl:87 #: views/html/characters/manage.tpl:13 views/html/questgroups/questgroup.tpl:62 #: views/html/quests/create.tpl:68 views/html/quests/create.tpl:69 @@ -1286,8 +1286,8 @@ msgstr "%squests" msgid "XPs" msgstr "XP" -#: views/html/charactergroups/group.tpl:68 -#: views/html/charactergroups/groupsgroup.tpl:53 +#: views/html/charactergroups/group.tpl:75 +#: views/html/charactergroups/groupsgroup.tpl:55 #: views/html/charactergroupsachievements/manage.tpl:11 #, php-format msgid "Manage %s-Achievements" @@ -1303,7 +1303,7 @@ msgstr "Neue %s-Gruppe" msgid "Create new %s-Quest" msgstr "Neue %s-Quest erstellen" -#: views/html/charactergroups/groupsgroup.tpl:52 +#: views/html/charactergroups/groupsgroup.tpl:54 #: views/html/charactergroupsachievements/manage.tpl:8 #, php-format msgid "Create new %s-Achievement" @@ -1393,30 +1393,30 @@ msgid "XPs invalid" msgstr "Die XP-Angabe ist ungültig" #: views/html/charactergroupsquests/create.tpl:74 -#: views/html/charactergroupsquests/edit.tpl:75 +#: views/html/charactergroupsquests/edit.tpl:77 #: views/html/questgroups/create.tpl:54 views/html/quests/index.tpl:10 msgid "Questgroup" msgstr "Questgruppe" #: views/html/charactergroupsquests/create.tpl:82 #: views/html/charactergroupsquests/create.tpl:83 -#: views/html/charactergroupsquests/edit.tpl:83 -#: views/html/charactergroupsquests/edit.tpl:84 +#: views/html/charactergroupsquests/edit.tpl:85 +#: views/html/charactergroupsquests/edit.tpl:86 #: views/html/charactergroupsquests/quest.tpl:46 msgid "Rules" msgstr "Regeln" #: views/html/charactergroupsquests/create.tpl:84 #: views/html/charactergroupsquests/create.tpl:85 -#: views/html/charactergroupsquests/edit.tpl:85 -#: views/html/charactergroupsquests/edit.tpl:86 +#: views/html/charactergroupsquests/edit.tpl:87 +#: views/html/charactergroupsquests/edit.tpl:88 msgid "Won-text" msgstr "Gewonnentext" #: views/html/charactergroupsquests/create.tpl:86 #: views/html/charactergroupsquests/create.tpl:87 -#: views/html/charactergroupsquests/edit.tpl:87 -#: views/html/charactergroupsquests/edit.tpl:88 +#: views/html/charactergroupsquests/edit.tpl:89 +#: views/html/charactergroupsquests/edit.tpl:90 msgid "Lost-text" msgstr "Verlorentext" @@ -1437,6 +1437,10 @@ msgstr "Soll die %s-Quest „%s“ wirklich gelöscht werden?" msgid "Edit %s-Quest" msgstr "%s-Quest bearbeiten" +#: views/html/charactergroupsquests/edit.tpl:72 +msgid "public" +msgstr "öffentlich" + #: views/html/charactergroupsquests/manage.tpl:22 #: views/html/charactergroupsquests/quest.tpl:27 #: views/html/seminaries/copy.tpl:77 @@ -1611,40 +1615,40 @@ msgstr "gescheitert um %s" msgid "Back to overview" msgstr "Zurück zur Übersicht" -#: views/html/characters/character.tpl:17 views/html/characters/edit.tpl:14 +#: views/html/characters/character.tpl:20 views/html/characters/edit.tpl:14 msgid "Edit Character" msgstr "Charakter bearbeiten" -#: views/html/characters/character.tpl:20 views/html/characters/delete.tpl:10 +#: views/html/characters/character.tpl:23 views/html/characters/delete.tpl:10 msgid "Delete Character" msgstr "Charakter löschen" -#: views/html/characters/character.tpl:30 +#: views/html/characters/character.tpl:33 msgid "Total progress" msgstr "Fortschritt" -#: views/html/characters/character.tpl:35 -#: views/html/characters/character.tpl:81 -#: views/html/characters/character.tpl:95 -#: views/html/characters/character.tpl:107 -#: views/html/charactertypes/edit.tpl:111 views/html/seminarybar/index.tpl:49 +#: views/html/characters/character.tpl:38 +#: views/html/characters/character.tpl:90 +#: views/html/characters/character.tpl:110 +#: views/html/characters/character.tpl:128 +#: views/html/charactertypes/edit.tpl:111 views/html/seminarybar/index.tpl:57 #: views/html/users/user.tpl:42 views/html/xplevels/manage.tpl:37 msgid "Level" msgstr "Level" -#: views/html/characters/character.tpl:46 +#: views/html/characters/character.tpl:49 msgid "Milestones" msgstr "Meilensteine" -#: views/html/characters/character.tpl:73 +#: views/html/characters/character.tpl:76 msgid "Ranking" msgstr "Ranking" -#: views/html/characters/character.tpl:134 views/html/seminarybar/index.tpl:19 +#: views/html/characters/character.tpl:155 views/html/seminarybar/index.tpl:22 msgid "Last Quest" msgstr "Letzter Speicherpunkt" -#: views/html/characters/character.tpl:140 +#: views/html/characters/character.tpl:161 msgid "Topic progress" msgstr "Thematischer Fortschritt" @@ -1711,7 +1715,7 @@ msgstr "männlich" msgid "Display settings" msgstr "Anzeigeeinstellungen" -#: views/html/characters/edit.tpl:90 +#: views/html/characters/edit.tpl:90 views/html/html.tpl:106 msgid "Charactertitle" msgstr "Charaktertitel" @@ -1990,11 +1994,11 @@ msgstr "oder" msgid "register yourself" msgstr "registriere dich" -#: views/html/html.tpl:104 +#: views/html/html.tpl:112 msgid "Level-up" msgstr "Levelaufstieg" -#: views/html/html.tpl:106 views/html/html.tpl:108 +#: views/html/html.tpl:114 views/html/html.tpl:116 #, php-format msgid "You have reached level %d" msgstr "Du hast Level %d erreicht" @@ -2516,11 +2520,11 @@ msgstr "Quests anzeigen" msgid "Recalculate XPs" msgstr "XP neuberechnen" -#: views/html/seminarybar/index.tpl:26 +#: views/html/seminarybar/index.tpl:29 msgid "Last Achievement" msgstr "Letztes Achievement" -#: views/html/seminarybar/index.tpl:57 +#: views/html/seminarybar/index.tpl:65 #, php-format msgid "Show %s-Profile" msgstr "%s-Profil anzeigen" diff --git a/models/CharactergroupsquestsModel.inc b/models/CharactergroupsquestsModel.inc index bc60896a..f3f144fe 100644 --- a/models/CharactergroupsquestsModel.inc +++ b/models/CharactergroupsquestsModel.inc @@ -50,7 +50,7 @@ public function getQuestsForCharactergroupsgroup($groupsgroupId) { return $this->db->query( - 'SELECT id, questgroups_id, title, url, xps, questsmedia_id '. + 'SELECT id, questgroups_id, title, url, xps, questsmedia_id, public '. 'FROM charactergroupsquests '. 'WHERE charactergroupsgroup_id = ? '. 'ORDER BY created ASC', @@ -71,7 +71,7 @@ public function getQuestByUrl($groupsgroupId, $questUrl) { $data = $this->db->query( - 'SELECT id, questgroups_id, title, url, description, xps, rules, won_text, lost_text, questsmedia_id '. + 'SELECT id, questgroups_id, title, url, description, xps, rules, won_text, lost_text, questsmedia_id, public '. 'FROM charactergroupsquests '. 'WHERE charactergroupsgroup_id = ? AND url = ?', 'is', @@ -97,7 +97,7 @@ public function getQuestById($questId) { $data = $this->db->query( - 'SELECT id, charactergroupsgroup_id, questgroups_id, title, url, description, xps, rules, won_text, lost_text, questsmedia_id '. + 'SELECT id, charactergroupsgroup_id, questgroups_id, title, url, description, xps, rules, won_text, lost_text, questsmedia_id, public '. 'FROM charactergroupsquests '. 'WHERE id = ?', 'i', @@ -322,9 +322,9 @@ { $this->db->query( 'INSERT INTO charactergroupsquests '. - '(created_user_id, charactergroupsgroup_id, questgroups_id, title, url, description, xps, rules, won_text, lost_text) '. + '(created_user_id, charactergroupsgroup_id, questgroups_id, title, url, description, xps, rules, won_text, lost_text, public) '. 'VALUES '. - '(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', + '(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0)', 'iiisssdsss', $userId, $groupsgroupId, @@ -346,23 +346,24 @@ /** * Edit a Character groups Quest. * - * @param int $questId ID of Character groups Quest to edit - * @param int $groupsgroupId ID of Character groups-group - * @param int $questgroupId ID of Quest group - * @param string $title Title of new Quest + * @param int $questId ID of Character groups Quest to edit + * @param int $groupsgroupId ID of Character groups-group + * @param int $questgroupId ID of Quest group + * @param string $title Title of new Quest * @param string $description Description of new Quset - * @param int $xps Amount of XPs for new Quest - * @param string $rules Rules of new Quest - * @param string $wonText Won-text of new Quset - * @param string $lostText Lost-text of new Quest + * @param int $xps Amount of XPs for new Quest + * @param string $rules Rules of new Quest + * @param string $wonText Won-text of new Quset + * @param string $lostText Lost-text of new Quest + * @param boolean $public Whether Quest is public visible or not */ - public function editQuest($questId, $groupsgroupId, $questgroupId, $title, $description, $xps, $rules, $wonText, $lostText) + public function editQuest($questId, $groupsgroupId, $questgroupId, $title, $description, $xps, $rules, $wonText, $lostText, $public) { $this->db->query( 'UPDATE charactergroupsquests '. - 'SET charactergroupsgroup_id = ?, questgroups_id = ?, title = ?, url = ?, description = ?, xps = ?, rules = ?, won_text = ?, lost_text= ? '. + 'SET charactergroupsgroup_id = ?, questgroups_id = ?, title = ?, url = ?, description = ?, xps = ?, rules = ?, won_text = ?, lost_text= ?, public = ? '. 'WHERE id = ?', - 'iisssdsssi', + 'iisssdsssii', $groupsgroupId, $questgroupId, $title, @@ -372,6 +373,7 @@ $rules, $wonText, $lostText, + $public, $questId ); } @@ -400,8 +402,8 @@ // Copy Quest $this->db->query( 'INSERT INTO charactergroupsquests '. - '(created_user_id, charactergroupsgroup_id, questgroups_id, title, url, description, xps, rules, won_text, lost_text) '. - 'SELECT ?, ?, ?, title, url, description, xps, rules, won_text, lost_text '. + '(created_user_id, charactergroupsgroup_id, questgroups_id, title, url, description, xps, rules, won_text, lost_text, public) '. + 'SELECT ?, ?, ?, title, url, description, xps, rules, won_text, lost_text, public '. 'FROM charactergroupsquests '. 'WHERE id = ?', 'iiii', diff --git a/views/html/charactergroups/groupsgroup.tpl b/views/html/charactergroups/groupsgroup.tpl index 96c99a0a..3c2761f5 100644 --- a/views/html/charactergroups/groupsgroup.tpl +++ b/views/html/charactergroups/groupsgroup.tpl @@ -38,10 +38,12 @@
    + 0) : ?>

    • +
diff --git a/views/html/charactergroupsquests/edit.tpl b/views/html/charactergroupsquests/edit.tpl index 37899249..c8f2a743 100644 --- a/views/html/charactergroupsquests/edit.tpl +++ b/views/html/charactergroupsquests/edit.tpl @@ -68,6 +68,8 @@
+ checked="checked" /> + />