X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttImportHelper.class.php;h=9ce34ff7eabb6201caeca5c140a1a82efeccc014;hb=6b1d36d49ecb821678978322df9754ce23bb0359;hp=b6c7b8b3ae8e9ac1080e74171fa8261c39a277ee;hpb=1ad0313b11df884c04ca0354abcbc18e4b334537;p=timetracker.git

diff --git a/WEB-INF/lib/ttImportHelper.class.php b/WEB-INF/lib/ttImportHelper.class.php
index b6c7b8b3..9ce34ff7 100644
--- a/WEB-INF/lib/ttImportHelper.class.php
+++ b/WEB-INF/lib/ttImportHelper.class.php
@@ -53,6 +53,7 @@ class ttImportHelper {
   // The following arrays are maps between entity ids in the file versus the database.
   // In the file they are sequential (1,2,3...) while in the database the entities have different ids.
   var $userMap       = array(); // User ids.
+  var $roleMap       = array(); // Role ids.
   var $projectMap    = array(); // Project ids.
   var $taskMap       = array(); // Task ids.
   var $clientMap     = array(); // Client ids.
@@ -138,7 +139,7 @@ class ttImportHelper {
           foreach ($this->users as $key=>$user_item) {
             $user_id = ttUserHelper::insert(array(
               'team_id' => $this->team_id,
-              'role' => $user_item['ROLE'],
+              'role_id' => $user_item['ROLE_ID'], // Note: NOT mapped value. Not implemented currently, need to fix.
               'client_id' => $user_item['CLIENT_ID'], // Note: NOT mapped value, replaced in CLIENT handler.
               'name' => $user_item['NAME'],
               'login' => $user_item['LOGIN'],
@@ -314,12 +315,20 @@ class ttImportHelper {
     }
 
     if ($name == 'ROLE' && $this->canImport) {
-      ttRoleHelper::insert(array(
+      $this->roleMap[$this->currentElement['ID']] = ttRoleHelper::insert(array(
         'team_id' => $this->team_id,
         'name' => $this->currentElement['NAME'],
         'rank' => $this->currentElement['RANK'],
         'rights' => $this->currentElement['RIGHTS'],
         'status' => $this->currentElement['STATUS']));
+
+      // Update role_id for tt_users to a mapped value.
+      // We did not do it during user insertion because roleMap was not ready then.
+      // TODO: write setMappedRole function.
+      /*
+        if ($this->currentElement['ID'] != $this->roleMap[$this->currentElement['ID']])
+          ttRoleHelper::setMappedRole($this->team_id, $this->currentElement['ID'], $this->roleMap[$this->currentElement['ID']]);
+       */
     }
     $this->currentTag = '';
   }