coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

move Seminary and Character data determination to SeminaryRoleController

Browse source
This commit is contained in:
coderkun 2014-04-15 20:04:46 +02:00
commit 160953c094
9 changed files with 38 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
controllers/AchievementsController.inc
View file

@ -59,7 +59,7 @@
$seminary = $this->Seminaries->getSeminaryByUrl($seminaryUrl);
// Get Character
$character = IntermediateController::$character;
$character = SeminaryRoleController::$character;
// Get Achievements
$achievements = $this->Achievements->getAchievementsForSeminary($seminary['id']);

4
controllers/HtmlController.inc
View file

@ -50,8 +50,8 @@
// Set userdata
$this->set('loggedUser', IntermediateController::$user);
$this->set('loggedSeminary', IntermediateController::$seminary);
$this->set('loggedCharacter', IntermediateController::$character);
$this->set('loggedSeminary', SeminaryRoleController::$seminary);
$this->set('loggedCharacter', SeminaryRoleController::$character);
}
}

4
controllers/LibraryController.inc
View file

@ -59,7 +59,7 @@
$seminary = $this->Seminaries->getSeminaryByUrl($seminaryUrl);
// Get Character
$character = IntermediateController::$character;
$character = SeminaryRoleController::$character;
// Get Quest topics
$questtopics = $this->Questtopics->getQuesttopicsForSeminary($seminary['id']);
@ -94,7 +94,7 @@
$seminary = $this->Seminaries->getSeminaryByUrl($seminaryUrl);
// Get Character
$character = IntermediateController::$character;
$character = SeminaryRoleController::$character;
// Get Questtopic
$questtopic = $this->Questtopics->getQuesttopicByUrl($seminary['id'], $questtopicUrl);

2
controllers/MediaController.inc
View file

@ -170,7 +170,7 @@
$seminary = $this->Seminaries->getSeminaryByUrl($seminaryUrl);
// Get Character
$character = IntermediateController::$character;
$character = SeminaryRoleController::$character;
// Get Achievement
$achievement = $this->Achievements->getAchievementByUrl($seminary['id'], $achievementUrl);

2
controllers/MenuController.inc
View file

@ -35,7 +35,7 @@
// Set userdata
$this->set('loggedUser', IntermediateController::$user);
$this->set('loggedSeminary', IntermediateController::$seminary);
$this->set('loggedSeminary', SeminaryRoleController::$seminary);
}

6
controllers/SeminarybarController.inc
View file

@ -35,15 +35,15 @@
*/
public function index()
{
if(is_null(IntermediateController::$seminary)) {
if(is_null(SeminaryRoleController::$seminary)) {
return;
}
// Get Seminary
$seminary = IntermediateController::$seminary;
$seminary = SeminaryRoleController::$seminary;
// Get Character
$character = IntermediateController::$character;
$character = SeminaryRoleController::$character;
if(is_null($character)) {
return;
}

2
controllers/SeminarymenuController.inc
View file

@ -36,7 +36,7 @@
// Set userdata
$this->set('loggedUser', IntermediateController::$user);
$this->set('loggedSeminary', IntermediateController::$seminary);
$this->set('loggedSeminary', SeminaryRoleController::$seminary);
}