From e62386ad656c4708644e2cc1e8ccba372f516538 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 23 Feb 2016 09:12:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=B1=80=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/trustie/gitlab/helper.rb | 24 ++++++++++++++++++++++++
 lib/trustie/gitlab/sync.rb   |  8 +++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/lib/trustie/gitlab/helper.rb b/lib/trustie/gitlab/helper.rb
index 61c1fbd17..a306bb855 100644
--- a/lib/trustie/gitlab/helper.rb
+++ b/lib/trustie/gitlab/helper.rb
@@ -3,6 +3,15 @@
 module Trustie
   module Gitlab
     module Helper
+      GUEST     = 10
+      REPORTER  = 20
+      DEVELOPER = 30
+      MASTER    = 40
+      OWNER     = 50
+      # 项目公开和私有
+      PUBLIC = 20
+      PRIVATE = 0
+      
       def change_password(uid, en_pwd, salt)
         return unless uid
         options = {:encrypted_password=>en_pwd, :password_salt=>salt}
@@ -44,6 +53,21 @@ module Trustie
         self.g.delete_user(user.gid)
       end
 
+      def get_gitlab_role m
+        case m.roles.first.position
+          when 1,2
+            GUEST
+          when 5
+            REPORTER
+          when 4
+            DEVELOPER
+          when 3
+            MASTER
+          else
+            GUEST
+        end
+      end
+
     end
   end
 end
\ No newline at end of file
diff --git a/lib/trustie/gitlab/sync.rb b/lib/trustie/gitlab/sync.rb
index d41b813e7..2f4f77c53 100644
--- a/lib/trustie/gitlab/sync.rb
+++ b/lib/trustie/gitlab/sync.rb
@@ -61,7 +61,7 @@ module Trustie
                 unless gid
                   gid = sync_user(m.user).id
                 end
-                self.g.add_team_member(gproject.id, gid, UserLevel::DEVELOPER)
+                self.g.add_team_member(gproject.id, gid, get_gitlab_role(m))
               rescue => e
                 puts e
               end
@@ -111,7 +111,7 @@ module Trustie
                 unless gid
                     gid = sync_user(m.user).id
                 end
-                self.g.add_team_member(gproject.id, gid, UserLevel::DEVELOPER)
+                self.g.add_team_member(gproject.id, gid, get_gitlab_role(m))
               rescue => e
                 puts e
               end
@@ -125,7 +125,7 @@ module Trustie
               unless gid
                 gid = sync_user(m.user).id
               end
-              self.g.add_team_member(project.gpid, gid, UserLevel::DEVELOPER)
+              self.g.add_team_member(project.gpid, gid, get_gitlab_role(m))
             rescue => e
               puts e
             end
@@ -134,6 +134,8 @@ module Trustie
 
         def remove_project
         end
+
+
     end
 
   end