Merge pull request #1 from fguillot/master

Update from upstream

1 files changed, 14 insertions, 4 deletions

diff --git a/app/Model/UserImport.php b/app/Model/UserImport.php
index 3c9e7a57..0ec4e802 100644
--- a/app/Model/UserImport.php
+++ b/app/Model/UserImport.php
@@ -4,6 +4,7 @@ namespace Kanboard\Model;
 
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
+use Kanboard\Core\Security\Role;
 use Kanboard\Core\Csv;
 
 /**
@@ -36,7 +37,7 @@ class UserImport extends Base
             'email'            => 'Email',
             'name'             => 'Full Name',
             'is_admin'         => 'Administrator',
-            'is_project_admin' => 'Project Administrator',
+            'is_manager'       => 'Manager',
             'is_ldap_user'     => 'Remote User',
         );
     }
@@ -75,10 +76,21 @@ class UserImport extends Base
     {
         $row['username'] = strtolower($row['username']);
 
-        foreach (array('is_admin', 'is_project_admin', 'is_ldap_user') as $field) {
+        foreach (array('is_admin', 'is_manager', 'is_ldap_user') as $field) {
             $row[$field] = Csv::getBooleanValue($row[$field]);
         }
 
+        if ($row['is_admin'] == 1) {
+            $row['role'] = Role::APP_ADMIN;
+        } elseif ($row['is_manager'] == 1) {
+            $row['role'] = Role::APP_MANAGER;
+        } else {
+            $row['role'] = Role::APP_USER;
+        }
+
+        unset($row['is_admin']);
+        unset($row['is_manager']);
+
         $this->removeEmptyFields($row, array('password', 'email', 'name'));
 
         return $row;
@@ -98,8 +110,6 @@ class UserImport extends Base
             new Validators\Unique('username', t('The username must be unique'), $this->db->getConnection(), User::TABLE, 'id'),
             new Validators\MinLength('password', t('The minimum length is %d characters', 6), 6),
             new Validators\Email('email', t('Email address invalid')),
-            new Validators\Integer('is_admin', t('This value must be an integer')),
-            new Validators\Integer('is_project_admin', t('This value must be an integer')),
             new Validators\Integer('is_ldap_user', t('This value must be an integer')),
         ));