diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb
index 5dc5d9542..6162c5b52 100644
--- a/app/helpers/members_helper.rb
+++ b/app/helpers/members_helper.rb
@@ -38,7 +38,7 @@ module MembersHelper
links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options|
link_to text, autocomplete_project_memberships_path(project, parameters.merge(:q => params[:q],:flag => true, :format => 'js')), :remote => true
}
- s + content_tag('ul', links,:class => 'wlist', :style =>"float:left;margin-top:0px;")
+ s + content_tag('ul', links,:class => 'wlist', :id => "course_member_pagination_links" )
end
# add by nwb
@@ -55,6 +55,19 @@ module MembersHelper
s + content_tag('ul', links,:class => 'wlist',:id => "course_member_pagination_links")
end
+ # 项目配置中添加成员列表
+ def render_principals_for_new_project_members(project)
+ scope = Principal.active.sorted.not_member_of(project).like(params[:q])
+ principals = paginateHelper scope,10
+ s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5', :id => 'principals')
+
+ links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true) {|text, parameters, options|
+ link_to text, appliedproject_project_memberships_path(project, parameters.merge(:q => params[:q], :format => 'js')), :remote => true
+ }
+
+ s + content_tag('ul', links,:class => 'wlist',:id => "course_member_pagination_links")
+ end
+
# 当前申请加入的成员名单
def render_principals_for_applied_members(project)
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 470d03f87..30dad5ff7 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -163,8 +163,16 @@
<%= link_to l(:label_invite_trustie_user), :controller=>"projects", :action=>"invite_members", :id => @project %>
<% end %>
-
- <%= render :partial => 'layouts/base_development_group', :locals => {:project => @project}%>
+
+
+ <% if @project.project_new_type == 1 || @project.project_new_type.nil? %>
+ <%= render :partial => 'layouts/base_development_group', :locals => {:project => @project}%>
+ <% elsif @project.project_new_type == 2 %>
+ <%= render :partial => 'layouts/base_research_team', :locals => {:project => @project}%>
+ <% else %>
+ <%= render :partial => 'layouts/base_friend_group', :locals => {:project => @project}%>
+ <% end %>
+
@@ -211,13 +219,13 @@
<% text = @project.project_new_type == 1 ? "development_group" : (@project.project_new_type == 2 ? "research_group" : "friend_organization")%>
-
+
请选择项目类型:
确定
diff --git a/app/views/members/autocomplete.js.erb b/app/views/members/autocomplete.js.erb
index f7f9de151..01faf7da9 100644
--- a/app/views/members/autocomplete.js.erb
+++ b/app/views/members/autocomplete.js.erb
@@ -2,7 +2,7 @@
<% if @flag == "true"%>
$('#principals_for_new_member').html('<%= escape_javascript(render_project_members(@project)) %>');
<% else%>
- $('#principals_for_new_member').html('<%= escape_javascript(render_principals_for_new_members(@project)) %>');
+ $('#principals_for_new_member').html('<%= escape_javascript(render_project_members(@project)) %>');
<% end%>
<% elsif @course%>
var checked = $("#principals input:checked").size();
diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb
index ac3d757fc..c59f24ad2 100644
--- a/app/views/projects/settings/_new_members.html.erb
+++ b/app/views/projects/settings/_new_members.html.erb
@@ -11,11 +11,11 @@
<% if members.any? %>
-
- - <%= l(:label_user) %><%= l(:label_role_plural) %>
+
+ - <%= l(:label_user) %><%= l(:label_role_plural) %>
<%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
<% members.each do |member| %>
- -
+
-
<%= link_to_user_header member.principal,false,:class => "w150 c_orange fl" %>
<%= h member.roles.sort.collect(&:to_s).join(', ') %>
@@ -25,8 +25,8 @@
) do |f| %>
<% roles.each do |role| %>
- <%= radio_button_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? } %>
+ <%= 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? } %>
@@ -50,68 +50,45 @@
:data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %>
<%# end%>
- <% end%>
-
-
-
+ <% end%>
+
<% else %>
<%= l(:label_no_data) %>
<% end %>
-
-
+申请加入
-
-
-
-
批准拒绝
+
<%= l(:label_member_new) %>
+ <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
+
+
+
+ <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
+
+
+
+ <%= render_principals_for_new_project_members(@project) %>
+
+
+
+
+ -
+ <%= l(:label_role_plural) %>:
+
+ <% roles.each do |role| %>
+ -
+ <%= check_box_tag 'membership[role_ids][]', role.id %>
+
+
+ <% end %>
+
+
+
+ 新增成员
+
+
+ <% end%>
+
+
+
-
-
-
-
\ No newline at end of file