From dfcc076a7f0a0e985d03ed2b55e4d1197875fbde Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 29 Apr 2015 16:46:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=A4=9A=E9=80=89=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_join_exit_project.html.erb     |  2 +-
 app/views/projects/settings/_new_members.html.erb | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/layouts/_join_exit_project.html.erb b/app/views/layouts/_join_exit_project.html.erb
index 1a757becc..ba3300d44 100644
--- a/app/views/layouts/_join_exit_project.html.erb
+++ b/app/views/layouts/_join_exit_project.html.erb
@@ -17,7 +17,7 @@
   <% end %>
   <!--退出项目-->
   <% if (User.current.member_of? @project) && User.current.login? && !User.current.admin &&
-     Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.first.to_s != "Manager" %>
+     !Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.first.to_s.include?("Manager") %>
       <%= exit_project_link(@project) %>
   <% end %>
 
diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb
index 5e2c9f603..7abe6198c 100644
--- a/app/views/projects/settings/_new_members.html.erb
+++ b/app/views/projects/settings/_new_members.html.erb
@@ -18,19 +18,19 @@
             <li >
               <%= link_to_user_header member.principal,false,:class => "w140_h c_setting_blue fl" %>
               <span class="w180_h fl">
-        <%= h member.roles.sort.collect(&:to_s).join(', ') %>
-                <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
-                                      :method => :put,
-                                      :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
+              <%= h member.roles.sort.collect(&:to_s).join(', ') %>
+              <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
+                                :method => :put,
+                                :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
                     ) do |f| %>
-            <% roles.each do |role| %>
+              <% roles.each do |role| %>
                 <ul style="text-align: left;" >
                   <%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
                                     :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %>
                   <label ><%= h role %></label>
                 </ul>
                 <!--<br/>-->
-            <% end %>
+              <% end %>
                     <%= hidden_field_tag 'membership[role_ids][]', '' %>
                     <div>
                       <a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;">
@@ -41,7 +41,7 @@
                       </a>
                     </div>
         <% end %>
-      </span>
+              </span>
               <% unless member.user_id == @project.user_id %>
                   <a href="javascript:void(0) " class="c_setting_blue ml30 fl" onclick="$('#member-<%= member.id%>-roles-form').show();$(this).parent().height(110);">编辑</a>
                   <%= delete_link membership_path(member),