Skip to content
Snippets Groups Projects
Commit 0c803634 authored by Jared Hancock's avatar Jared Hancock
Browse files

dept: Correct ability to add duplicate name

parent 3effac54
No related branches found
No related tags found
No related merge requests found
...@@ -420,11 +420,11 @@ implements TemplateVariable { ...@@ -420,11 +420,11 @@ implements TemplateVariable {
} }
/*----Static functions-------*/ /*----Static functions-------*/
static function getIdByName($name, $pid=0) { static function getIdByName($name, $pid=null) {
$row = static::objects() $row = static::objects()
->filter(array( ->filter(array(
'name' => $name, 'name' => $name,
'pid' => $pid ?: 0)) 'pid' => $pid ?: null))
->values_flat('id') ->values_flat('id')
->first(); ->first();
...@@ -553,7 +553,7 @@ implements TemplateVariable { ...@@ -553,7 +553,7 @@ implements TemplateVariable {
if (!$vars['name']) { if (!$vars['name']) {
$errors['name']=__('Name required'); $errors['name']=__('Name required');
} elseif (($did = static::getIdByName($vars['name'], $vars['pid'])) } elseif (($did = static::getIdByName($vars['name'], $vars['pid']))
&& $did != $this->id) { && $did != $id) {
$errors['name']=__('Department already exists'); $errors['name']=__('Department already exists');
} }
...@@ -576,7 +576,7 @@ implements TemplateVariable { ...@@ -576,7 +576,7 @@ implements TemplateVariable {
if ($errors) if ($errors)
return false; return false;
$this->pid = $vars['pid'] ?: 0; $this->pid = $vars['pid'] ?: null;
$this->ispublic = isset($vars['ispublic'])?$vars['ispublic']:0; $this->ispublic = isset($vars['ispublic'])?$vars['ispublic']:0;
$this->email_id = isset($vars['email_id'])?$vars['email_id']:0; $this->email_id = isset($vars['email_id'])?$vars['email_id']:0;
$this->tpl_id = isset($vars['tpl_id'])?$vars['tpl_id']:0; $this->tpl_id = isset($vars['tpl_id'])?$vars['tpl_id']:0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment