X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=role_add.php;h=97883151b08dc5afea3a9b733c4dd63da2b618b3;hb=HEAD;hp=086da632c9a71001e0707b5a3198678133e54524;hpb=45c855269d952873285f7a835e82fc2b3eff3971;p=timetracker.git diff --git a/role_add.php b/role_add.php index 086da632..97883151 100644 --- a/role_add.php +++ b/role_add.php @@ -28,7 +28,6 @@ require_once('initialize.php'); import('form.Form'); -import('ttTeamHelper'); import('ttRoleHelper'); // Access check. @@ -57,13 +56,13 @@ if ($request->isPost()) { if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name')); if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description')); if ($cl_rank >= $user->rank || $cl_rank < 0) $err->add($i18n->get('error.field'), $i18n->get('form.roles.rank')); + if ($err->no() && ttRoleHelper::getRoleByName($cl_name)) $err->add($i18n->get('error.object_exists')); if ($err->no()) { - $existing_role = ttRoleHelper::getRoleByRank($cl_rank, $user->group_id); + $existing_role = ttRoleHelper::getRoleByRank($cl_rank); if (!$existing_role) { // Insert a role with default user rights. if (ttRoleHelper::insert(array( - 'group_id' => $user->group_id, 'name' => $cl_name, 'rank' => $cl_rank, 'description' => $cl_description,