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

fix check of Character groups-group title by using Seminary-ID (fixes #151)

Browse source
This commit is contained in:
oliver 2016-04-09 13:06:04 +02:00
parent 4e7fdd973e
commit 67f92d6174
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/CharactergroupsController.inc
View file

@ -168,7 +168,7 @@
// Get params and validate them // Get params and validate them
$validation = $this->Validation->validateParams($this->request->getPostParams(), $fields); $validation = $this->Validation->validateParams($this->request->getPostParams(), $fields);
$charactergroupsgroupname = $this->request->getPostParam('charactergroupsgroupname'); $charactergroupsgroupname = $this->request->getPostParam('charactergroupsgroupname');
if($this->Charactergroups->characterGroupsgroupNameExists($charactergroupsgroupname)) { if($this->Charactergroups->characterGroupsgroupNameExists($seminary['id'], $charactergroupsgroupname)) {
$validation = $this->Validation->addValidationResult($validation, 'charactergroupsgroupname', 'exist', true); $validation = $this->Validation->addValidationResult($validation, 'charactergroupsgroupname', 'exist', true);
} }
$preferred = !is_null($this->request->getPostParam('preferred')); $preferred = !is_null($this->request->getPostParam('preferred'));

14
models/CharactergroupsModel.inc
View file

@ -113,17 +113,19 @@
/** /**
* Check if a Character groups-group name already exists. * Check if a Character groups-group name already exists.
* *
* @param string $name Name to check * @param int $seminaryId ID of Seminary
* @param int $groupsgroupId Do not check this ID (for editing) * @param string $name Name to check
* @return boolean Whether name exists or not * @param int $groupsgroupId Do not check this ID (for editing)
* @return boolean Whether name exists or not
*/ */
public function characterGroupsgroupNameExists($name, $groupsgroupId=null) public function characterGroupsgroupNameExists($seminaryId, $name, $groupsgroupId=null)
{ {
$data = $this->db->query( $data = $this->db->query(
'SELECT id '. 'SELECT id '.
'FROM charactergroupsgroups '. 'FROM charactergroupsgroups '.
'WHERE name = ? OR url = ?', 'WHERE seminary_id = ? AND (name = ? OR url = ?)',
'ss', 'iss',
$seminaryId,
$name, $name,
\nre\core\Linker::createLinkParam($name) \nre\core\Linker::createLinkParam($name)
); );