From 326c3a84a0ff336b98a4c3ef3ab8032787516f3b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 17 May 2016 09:52:26 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/setting.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 1eb98d229..0c8af8471 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -111,11 +111,11 @@
             <p class="fontBlue fb mb5">添加成员</p>
             <%= form_tag url_for(:controller => 'org_member', :action => 'create', :org => @organization),:id=>'org_member_add_form',:remote=>true do |f|%>
                 <input type="text" id="not_org_member_search" name="orgAddSearch" placeholder="支持姓名、邮箱、登录名搜索" class="orgAddSearch mb20" />
-                <% if @organization.secdomain_name.nil? %>
+                <%# if @organization.secdomain_name.nil? %>
                     <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  host_with_protocol + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
-                <% else %>
-                    <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  secdomain_with_protocol(@organization.secdomain_name) + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
-                <% end %>
+                <%# else %>
+                    <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  secdomain_with_protocol(@organization.secdomain_name) + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
+                <%# end %>
 
                 <div id="principals_for_new_member">
                   <%= find_user_not_in_current_org_by_name(@project) %>

From e9c35ae20f90dd621cea1667477958754fef88d1 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 17 May 2016 10:13:03 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=AA=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=83=85=E5=86=B5=E9=BB=98=E8=AE=A4=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org2.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index dd85d2e4b..799aaa42b 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -62,7 +62,7 @@
   <div class="sn-header">
     <div class="sn-row sn-bg-white">
       <div class="sn-logo">
-        <% if @org_logo_attchment.blank? %>
+        <% if @org_logo_attchment.blank? || !User.current.logged? %>
             <img src="/images/org_new_style/logo.jpg"  width="367" height="63" class="sn-mt13 sn-fl" alt=""/>
         <% else %>
             <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13 sn-fl" alt="">

From 11bc6b1e6c6605a0e7c89fec96a2846a871750cf Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 17 May 2016 10:18:24 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=85=8D=E7=BD=AE500=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index babeb5f30..1d43ff69a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -88,11 +88,13 @@ module ApplicationHelper
 
  # 获取组织成员中文名字
   def get_org_member_role_name member
-    case member.roles[0].name
-      when 'orgManager'
-        '管理人员'
-      when 'orgMember'
-        '组织成员'
+    unless member.roles[0].nil?
+      case member.roles[0].name
+        when 'orgManager'
+          '管理人员'
+        when 'orgMember'
+          '组织成员'
+      end
     end
   end
 

From 0cba32ecd633555153cca802510946c1bca20903 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 17 May 2016 11:23:20 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=8C=97=E6=96=97=E5=8D=95=E7=82=B9?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=BC=95=E8=B5=B7=E7=9A=84500=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/ssos_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/ssos_controller.rb b/app/controllers/ssos_controller.rb
index 9f05fc19b..9a5042c50 100644
--- a/app/controllers/ssos_controller.rb
+++ b/app/controllers/ssos_controller.rb
@@ -27,8 +27,10 @@ class SsosController < ApplicationController
       ## 加入组织
       @organization = Organization.find(82)
       unless @organization.org_members.exists?(user_id: sso.user_id)
-        member = OrgMember.new(:user_id => sso.user_id)
+        member =  OrgMember.create(:user_id => sso.user_id, :created_at => Time.now)
+        # member = OrgMember.new(:user_id => sso.user_id)
         @organization.org_members << member
+        OrgMemberRole.create(:org_member_id => member.id, :role_id => 12)
       end
 
       ## 选择性跳转