diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index d63f0cfbb..87b0d8dcf 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -881,6 +881,7 @@ class BidsController < ApplicationController
 
   def memberAccess
     # 是课程，则判断当前用户是否参加了课程
+    return true if current_user.admin?
     return 0 if @bid.courses.first.project_type == Project::ProjectType_project
     currentUser = User.current
     render_403 unless currentUser.member_of?(@bid.courses.first)
diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb
index f97e9d0f2..615bcc65a 100644
--- a/app/views/projects/settings/_members.html.erb
+++ b/app/views/projects/settings/_members.html.erb
@@ -1,125 +1,87 @@
 <%= error_messages_for 'member' %>
-<% roles = Role.find_all_givable
-   members = @project.member_principals.includes(:roles, :principal).all.sort %>
+<%
+   if @project.project_type == Project::ProjectType_course
+     roles = Role.givable.all[3..5]
+   else
+     roles = Role.givable.all[0..2]
+   end
+   members = @project.member_principals.includes(:roles, :principal).all.sort
+%>
+
 <div class="splitcontentleft">
-<% if members.any? %>
-<table class="list members">
-  <thead><tr>
-    <th><%= l(:label_user) %></th>
-    <th><%= l(:label_role_plural) %></th>
-    <th style="width:15%"></th>
+  <% if members.any? %>
+      <table class="list members">
+        <thead>
+        <tr>
+          <th><%= l(:label_user) %></th>
+          <th><%= l(:label_role_plural) %></th>
+          <th style="width:15%"></th>
           <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
-  </tr></thead>
-  <tbody>
-  <% members.each do |member| %>
-  <% next if member.new_record? %>
-  <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
-  <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
-  <td class="roles">
-    <span id="member-<%= member.id %>-roles"><!-- <%=h member.roles.sort.collect(&:to_s).join(', ') %> -->
-    	<!--modified by huang for: -->
-     <% if @project.project_type == 1 %>     				       
-      	<% if member.roles.sort.collect(&:to_s).join(', ') =='Manager' %>
-      	老师      
-      	<% else %>
-      	<%=h member.roles.sort.collect(&:to_s).join(', ') %>
-      	<% end %>	      	 
-     <% else %>         	
-      	<%=h member.roles.sort.collect(&:to_s).join(', ') %>
-     <% end %>
+        </tr>
+        </thead>
+        <tbody>
+        <% members.each do |member| %>
+            <% next if member.new_record? %>
+            <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
+              <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
+              <td class="roles">
+    <span id="member-<%= member.id %>-roles">
+      <%= h member.roles.sort.collect(&:to_s).join(', ') %>
     </span>
-      <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
-                                          :method => :put,
-                                          :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }}
-             ) do |f| %>
- <!--added by huang for: filer the roles-->
-<%= error_messages_for 'member' %>
-<% if @project.project_type == 1 %>
-<% r = [] %>
-<% for i in 3..5 %>
-<% roles = Role.givable.all[i]
-   members = @project.member_principals.includes(:roles, :principal).all.sort %>
-   <% r << roles %>     
-   <% end %>
-<% else %>
-<% r = [] %>
-<% for i in 0..2 %>
-<% roles = Role.givable.all[i]
-   members = @project.member_principals.includes(:roles, :principal).all.sort %>
-   <% r << roles %>     
-   <% end %>
-<% end %>
-<!--end-->                                      
-        <p><% r.each do |role| %>
-        <label><%= 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?} %> <%=h role %></label><br />
-        <% end %></p>
-        <%= hidden_field_tag 'membership[role_ids][]', '' %>
-        <p><%= submit_tag l(:button_change), :class => "small" %>
-        <%= link_to_function l(:button_cancel),
-                             "$('#member-#{member.id}-roles').show(); $('#member-#{member.id}-roles-form').hide(); return false;"
-             %></p>
-      <% end %>
-  </td>
-  <!--modified by huang for: if the user'roles is Manager that he will can't modified himself-->
-  <%= error_messages_for 'member' %>
-<% roles = Role.find_all_givable
-   members = @project.member_principals.includes(:roles, :principal).all.sort %>
-  <% if @project.project_type == 1 %>
-  	<%if member.roles.first.to_s == "Manager" %>
- 		 <td class="buttons"></td> 
-  	<% else %>
-  		<td class="buttons">
-     	 <%= link_to_function l(:button_edit),
-                           "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;",
-                           :class => 'icon icon-edit' %>
-     	 <%= delete_link membership_path(member),
-                      :remote => true,
-                      :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %> 
-  		</td>   
-    <% end %>
-  <% else %> 
-   		<td class="buttons">
-     	 <%= link_to_function l(:button_edit),
-                           "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;",
-                           :class => 'icon icon-edit' %>
-     	 <%= delete_link membership_path(member),
-                      :remote => true,
-                      :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %> 
-  		</td>  
+                <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
+                                      :method => :put,
+                                      :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
+                    ) do |f| %>
+
+                    <p>
+                      <% roles.each do |role| %>
+                          <label><%= 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? } %> <%= h role %></label><br/>
+                      <% end %></p>
+                    <%= hidden_field_tag 'membership[role_ids][]', '' %>
+                    <p><%= submit_tag l(:button_change), :class => "small" %>
+                      <%= link_to_function l(:button_cancel),
+                                           "$('#member-#{member.id}-roles').show(); $('#member-#{member.id}-roles-form').hide(); return false;"
+                      %></p>
+                <% end %>
+              </td>
+              <!--modified by huang for: if the user'roles is Manager that he will can't modified himself-->
+              <% if @project.project_type == 1 %>
+                  <% if member.roles.first.to_s == "Manager" %>
+                      <td class="buttons"></td>
+                  <% else %>
+                      <td class="buttons">
+                        <%= link_to_function l(:button_edit),
+                                             "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;",
+                                             :class => 'icon icon-edit' %>
+                        <%= delete_link membership_path(member),
+                                        :remote => true,
+                                        :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %>
+                      </td>
+                  <% end %>
+              <% else %>
+                  <td class="buttons">
+                    <%= link_to_function l(:button_edit),
+                                         "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;",
+                                         :class => 'icon icon-edit' %>
+                    <%= delete_link membership_path(member),
+                                    :remote => true,
+                                    :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %>
+                  </td>
+              <% end %>
+              <!--end-->
+              <%= call_hook(:view_projects_settings_members_table_row, {:project => @project, :member => member}) %>
+            </tr>
+        <% end; reset_cycle %>
+        </tbody>
+      </table>
+  <% else %>
+      <p class="nodata"><%= l(:label_no_data) %></p>
   <% end %>
-  <!--end-->
-  <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
-  </tr>
-<% end; reset_cycle %>
-  </tbody>
-</table>
-<% else %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
 </div>
 
-<!--added by huang for: filer the roles-->
-<%= error_messages_for 'member' %>
-<% if @project.project_type == 1 %>
-<% r = [] %>
-<% for i in 3..5 %>
-<% roles = Role.givable.all[i]
-   members = @project.member_principals.includes(:roles, :principal).all.sort %>
-   <% r << roles %>     
-   <% end %>
-<% else %>
-<% r = [] %>
-<% for i in 0..2 %>
-<% roles = Role.givable.all[i]
-   members = @project.member_principals.includes(:roles, :principal).all.sort %>
-   <% r << roles %>     
-   <% end %>
-<% end %>
-<!--end-->
-
 <div class="splitcontentright">
-<% if r.any? %>
+  <% if roles.any? %>
       <% if @project.applied_projects.any? %>
           <div id="applied_project_block">
             <%= form_for(@applied_members, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
@@ -131,7 +93,7 @@
                   </div>
                   <!--show the roles which will select-->
                   <p style="padding-top: 5px"><%= l(:label_role_plural) %>:
-                    <% r.each do |role| %>
+                    <% roles.each do |role| %>
 
                         <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%= h role %></label>
                     <% end %></p>
@@ -144,24 +106,25 @@
           </div>
       <% end %>
 
-  <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
-    <fieldset><legend><%=l(:label_member_new)%></legend>
+      <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
+          <fieldset>
+            <legend><%= l(:label_member_new) %></legend>
 
-    <p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
-    <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
+            <p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
+            <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
 
-    <div id="principals_for_new_member">
-      <%= render_principals_for_new_members(@project) %>
-    </div>
- <!--show the roles which will select-->
-    <p style="padding-top: 5px"><%= l(:label_role_plural) %>:    	    	
-    <% r.each do |role| %> 
-      	   	
-      <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>    
-    <% end %></p>
+            <div id="principals_for_new_member">
+              <%= render_principals_for_new_members(@project) %>
+            </div>
+            <!--show the roles which will select-->
+            <p style="padding-top: 5px"><%= l(:label_role_plural) %>:
+              <% roles.each do |role| %>
 
-    <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
-    </fieldset>
+                  <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%= h role %></label>
+              <% end %></p>
+
+            <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
+          </fieldset>
+      <% end %>
   <% end %>
-<% end %>
 </div>