diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 2a5c7f118..6271a6832 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -60,8 +60,12 @@ class MembersController < ApplicationController user_ids.each do |user_id| AppliedProject.deleteappiled(user_id, @project.id) end + @succes_message = "拒绝成功" end end + respond_to do |format| + format.js + end else #modify by nwb #更改课程成员逻辑 @@ -119,6 +123,8 @@ class MembersController < ApplicationController else unless members.present? && members.all? {|m| m.valid? } @project_error_message = members.empty? ? l(:label_user_role_null) :members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ') + else + @succes_message = "添加成功" end respond_to do |format| format.html { redirect_to_settings_in_projects } @@ -187,6 +193,8 @@ class MembersController < ApplicationController end # end of params[:refusal_button] + + end def update diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9c6265f02..c692d63f1 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -572,6 +572,15 @@ module ApplicationHelper s.html_safe end + # li标签checkbos扩展 + def principals_check_box_tags_li(name, principals) + s = '' + principals.each do |principal| + s << "
  • #{ check_box_tag name, principal.id, false, :id => nil } #{h link_to principal.userInfo, user_path( principal.id), :class => "c_blue" }
    • \n" + end + s.html_safe + end + #扩展的checkbox生成 def principals_radio_box_tags_ex(name, principals) s = '' diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb index 149acb5dd..d1cd3ccd0 100644 --- a/app/helpers/members_helper.rb +++ b/app/helpers/members_helper.rb @@ -72,7 +72,7 @@ module MembersHelper def render_principals_for_applied_members_new project scope = project.applied_projects.map(&:user) principals = paginateHelper scope,10 - s = content_tag('ul', principals_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5') + s = content_tag('ul', principals_check_box_tags_li('membership[user_ids][]', principals), :class => 'mb5') 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],:flag => true, :format => 'js')), :remote => true } diff --git a/app/views/members/create.js.erb b/app/views/members/create.js.erb index 2e7af18d8..61310b22e 100644 --- a/app/views/members/create.js.erb +++ b/app/views/members/create.js.erb @@ -4,7 +4,7 @@ <% else%> $('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>'); hideOnLoad(); - alert("添加成功"); + alert("<%= @succes_message%>"); <% end%> <%elsif @course%> <% if @create_member_error_messages%> diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb index 82ed52d9a..0d273fc29 100644 --- a/app/views/projects/settings/_new_members.html.erb +++ b/app/views/projects/settings/_new_members.html.erb @@ -47,7 +47,7 @@ <%= delete_link membership_path(member), :remote => true, :class => "c_dblue ml30 fl", - :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %> + :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_for_project_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %> <% end%> <% end%> @@ -55,14 +55,14 @@ <% else %>

    <%= l(:label_no_data) %>

    <% end %> - - + + <% if roles.any? %>
    - + <% if @project.applied_projects.any? %> -
    -

    <%= l(:label_apply_project) %>

    +
    +

    <%= l(:label_apply_project) %>

    <%= form_for(@applied_members, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %> - <% end %> +
    +
    + <% end %>
    - +

    <%= l(:label_member_new) %>

    <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
    @@ -111,7 +112,7 @@ <% end %>
    - + 新增成员
    @@ -119,3 +120,17 @@
    <% end %> + \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 0668f152e..6fc7aa8da 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -981,6 +981,7 @@ zh: text_wiki_page_destroy_children: 删除子页面及其所有下级页面 text_wiki_page_reassign_children: 将子页面的上级页面设置为 text_own_membership_delete_confirmation: 你正在删除你现有的某些或全部权限，如果这样做了你可能将会再也无法编辑该课程了。你确定要继续吗？ + text_own_membership_for_project_confirmation: 你正在删除现有的某些或全部权限，如果这样做了你可能将会再也无法编辑该项目了。你确定要继续吗？ text_zoom_in: 放大 text_zoom_out: 缩小 text_applied_project: "用户 %{id} 申请加入项目 %{project}" diff --git a/public/javascripts/project.js b/public/javascripts/project.js index 01cdae5d7..18d461029 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -188,4 +188,11 @@ function project_setting(n) function submitModules() { $("#modules-form").submit(); +} + +//配置--成员---申请列表--拒绝 +function refusal_applied_member() +{ + $('#new_membership').append(""); + $('#new_membership').submit(); } \ No newline at end of file