From 2a932d1134897ce279480548ad9a09dd19c13426 Mon Sep 17 00:00:00 2001 From: oliver Date: Sat, 12 Mar 2016 16:03:38 +0100 Subject: [PATCH] include Character groups Achievements when copying Seminaries --- controllers/SeminariesController.inc | 1 + models/SeminariesModel.inc | 9 +++++++-- views/html/seminaries/copy.tpl | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/controllers/SeminariesController.inc b/controllers/SeminariesController.inc index 05ec665d..eacc9073 100644 --- a/controllers/SeminariesController.inc +++ b/controllers/SeminariesController.inc @@ -461,6 +461,7 @@ array_key_exists('charactergroupsgroups', $elements), array_key_exists('charactergroupsquests', $elements), array_key_exists('charactergroupsqueststations', $elements), + array_key_exists('charactergroupsachievements', $elements), array_key_exists('map', $elements) ); $seminary = $this->Seminaries->getSeminaryById($seminaryId); diff --git a/models/SeminariesModel.inc b/models/SeminariesModel.inc index 33fb1668..cee45928 100644 --- a/models/SeminariesModel.inc +++ b/models/SeminariesModel.inc @@ -24,7 +24,7 @@ * * @var array */ - public $models = array('questgroupshierarchy', 'questgroups', 'quests', 'questtopics', 'media', 'characters', 'charactertypes', 'xplevels', 'avatars', 'achievements', 'charactergroups', 'charactergroupsquests', 'charactergroupsqueststations', 'seminarycharacterfields', 'map', 'uploads'); + public $models = array('questgroupshierarchy', 'questgroups', 'quests', 'questtopics', 'media', 'characters', 'charactertypes', 'xplevels', 'avatars', 'achievements', 'charactergroups', 'charactergroupsquests', 'charactergroupsqueststations', 'charactergroupsachievements', 'seminarycharacterfields', 'map', 'uploads'); @@ -348,10 +348,11 @@ * @param boolean $copyCharactergroupsgroups Whether to copy Character groups-groups or not * @param boolean $copyCharactergroupsquests Whether to copy Character groups Quests or not * @param boolean $copyCharactergroupsqueststations Whether to copy Character groups Quest Stations or not + * @param boolean $copyCharactergroupsachievements Whether to copy Character groups Achievements or not * @param boolean $copyMap Whether to copy Map or not * @return ID of newly created Seminary */ - public function copySeminary($userId, $sourceSeminaryId, $title, $course, $description, $copySeminaryfields, $copyMedia, $copyQuestgroupshierarchy, $copyQuestgroups, $copyQuests, $copyQuesttopics, $copyCharactertypes, $copyXPlevels, $copyAvatars, $copyAchievements, $copyCharactergroupsgroups, $copyCharactergroupsquests, $copyCharactergroupsqueststations, $copyMap) + public function copySeminary($userId, $sourceSeminaryId, $title, $course, $description, $copySeminaryfields, $copyMedia, $copyQuestgroupshierarchy, $copyQuestgroups, $copyQuests, $copyQuesttopics, $copyCharactertypes, $copyXPlevels, $copyAvatars, $copyAchievements, $copyCharactergroupsgroups, $copyCharactergroupsquests, $copyCharactergroupsqueststations, $copyCharactergroupsachievements, $copyMap) { // Get Seminary $seminary = $this->getSeminaryById($sourceSeminaryId); @@ -452,6 +453,10 @@ $this->Charactergroupsqueststations->copyStationsOfSeminary($userId, $charactergroupsquestIds, $seminaryMediaIds); } } + // Copy Charactergroupsachievements + if($copyCharactergroupsachievements) { + $this->Charactergroupsachievements->copyAchievementsOfSeminary($userId, $characterGroupsgroupIds, $seminaryMediaIds); + } } // Copy Map diff --git a/views/html/seminaries/copy.tpl b/views/html/seminaries/copy.tpl index 74bfc50c..0895b857 100644 --- a/views/html/seminaries/copy.tpl +++ b/views/html/seminaries/copy.tpl @@ -110,6 +110,8 @@ checked="checked" /> + checked="checked" /> + checked="checked" />