X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=role_add.php;h=e1e16cc77a7de94544868fefbd0e6f32ca9be46c;hb=d6a5ffec0f76b9ab5b1ee4f8e69ecdb2afd7c0ff;hp=d26cb6ad03d97c13e8a41db3acb42c0b32a137fe;hpb=dab1057395c8eb9c5dce5480a738de1467e83ba5;p=timetracker.git

diff --git a/role_add.php b/role_add.php
index d26cb6ad..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,13 +56,15 @@ 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->team_id);
+    $existing_role = ttRoleHelper::getRoleByRank($cl_rank, $user->group_id);
     if (!$existing_role) {
         // Insert a role with default user rights.
         if (ttRoleHelper::insert(array(
-          'team_id' => $user->team_id,
+          'group_id' => $user->group_id,
+          'org_id' => $user->org_id,
           'name' => $cl_name,
           'rank' => $cl_rank,
           'description' => $cl_description,