X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=role_add.php;h=e1e16cc77a7de94544868fefbd0e6f32ca9be46c;hb=725af06a89e5a7014dfdc9081222f313a58a6bb6;hp=086da632c9a71001e0707b5a3198678133e54524;hpb=45c855269d952873285f7a835e82fc2b3eff3971;p=timetracker.git

diff --git a/role_add.php b/role_add.php
index 086da632..e1e16cc7 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,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);
@@ -64,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,