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

correctly use Character groups-group context for checking titles of Character groups and Quests (fixes #96)

Browse source
This commit is contained in:
oliver 2015-05-12 10:39:50 +02:00
commit 9b05e7400e
4 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
controllers/CharactergroupsController.inc
View file

@ -484,7 +484,7 @@
// Get params and validate them
$validation = $this->Validation->validateParams($this->request->getPostParams(), $fields);
$charactergroupname = $this->request->getPostParam('charactergroupname');
if($this->Charactergroups->characterGroupNameExists($charactergroupname)) {
if($this->Charactergroups->characterGroupNameExists($groupsgroup['id'], $charactergroupname)) {
$validation = $this->Validation->addValidationResult($validation, 'charactergroupname', 'exist', true);
}
$motto = $this->request->getPostParam('motto');
@ -615,7 +615,7 @@
// Get params and validate them
$validation = $this->Validation->validateParams($this->request->getPostParams(), $fields);
$charactergroupname = (count(array_intersect(array('admin','moderator'), \hhu\z\controllers\SeminaryController::$character['characterroles'])) > 0) ? $this->request->getPostParam('charactergroupname') : $group['name'];
if($this->Charactergroups->characterGroupNameExists($charactergroupname, $group['id'])) {
if($this->Charactergroups->characterGroupNameExists($groupsgroup['id'], $charactergroupname, $group['id'])) {
$validation = $this->Validation->addValidationResult($validation, 'charactergroupname', 'exist', true);
}
$motto = $this->request->getPostParam('motto');

4
controllers/CharactergroupsquestsController.inc
View file

@ -291,7 +291,7 @@
// Get params and validate them
$validation = $this->Validation->validateParams($this->request->getPostParams(), $fields);
$title = $this->request->getPostParam('title');
if($this->Charactergroupsquests->characterGroupsQuestTitleExists($title)) {
if($this->Charactergroupsquests->characterGroupsQuestTitleExists($groupsgroup['id'], $title)) {
$validation = $this->Validation->addValidationResult($validation, 'title', 'exist', true);
}
$xps = $this->request->getPostParam('xps');
@ -453,7 +453,7 @@
// Get params and validate them
$validation = $this->Validation->validateParams($this->request->getPostParams(), $fields);
$title = $this->request->getPostParam('title');
if($this->Charactergroupsquests->characterGroupsQuestTitleExists($title, $quest['id'])) {
if($this->Charactergroupsquests->characterGroupsQuestTitleExists($groupsgroup['id'], $title, $quest['id'])) {
$validation = $this->Validation->addValidationResult($validation, 'title', 'exist', true);
}
$xps = $this->request->getPostParam('xps');