X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=role_add.php;h=e1e16cc77a7de94544868fefbd0e6f32ca9be46c;hb=3fe430d82ad416d1766b9f0cd558e2e1f26900a9;hp=c8df24c732a09aec6cb5e24273e867a90160c1dd;hpb=de05f61301a897661c702f03c1b45dd3ab5c0e8a;p=timetracker.git diff --git a/role_add.php b/role_add.php index c8df24c7..e1e16cc7 100644 --- a/role_add.php +++ b/role_add.php @@ -56,6 +56,7 @@ 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); @@ -63,6 +64,7 @@ if ($request->isPost()) { // Insert a role with default user rights. if (ttRoleHelper::insert(array( 'group_id' => $user->group_id, + 'org_id' => $user->org_id, 'name' => $cl_name, 'rank' => $cl_rank, 'description' => $cl_description,