From fc8dacbd5f0141af39d9d2d3863b8e3c85cea719 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 17 Apr 2015 12:56:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BC=95=E5=85=A5=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/files_helper.rb | 2 +- app/views/files/_show_quote_resource_project.html.erb | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb index d57cd68eb..04363653f 100644 --- a/app/helpers/files_helper.rb +++ b/app/helpers/files_helper.rb @@ -61,7 +61,7 @@ module FilesHelper s = '' projects.each do |project| if !project_contains_attachment?(project,attachment) && User.current.allowed_to?(:manage_files, project) - s << "" + s << "
" end end s.html_safe diff --git a/app/views/files/_show_quote_resource_project.html.erb b/app/views/files/_show_quote_resource_project.html.erb index 7df1dc2f3..9ea9126fb 100644 --- a/app/views/files/_show_quote_resource_project.html.erb +++ b/app/views/files/_show_quote_resource_project.html.erb @@ -1,6 +1,6 @@
-

将此课件引入我的资源库

+

将此文件件引入我的资源库

<% if error == '403' %>
您没有权限引用此资源
@@ -13,13 +13,11 @@ remote: true, id: "relation_file_form" do %> <%= hidden_field_tag(:file_id, file.id) %> - <%= content_tag('div', projects_check_box_tags('projects[project][]', User.current.projects,project,file), :id => 'projects')%> + <%= content_tag('div', projects_check_box_tags('projects[project][]', User.current.projects,project,file), :id => 'projects', :class => "hidden")%> 引  用取  消 <% end -%>
<% end %> - -
From 14a0d885f0afbb2e60f7d3ac70524751bb1f94ee Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 17 Apr 2015 13:49:40 +0800 Subject: [PATCH 2/4] settings --- .../projects/settings/_new_members.html.erb | 164 +++++++++--------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb index 3356a351a..22fb70292 100644 --- a/app/views/projects/settings/_new_members.html.erb +++ b/app/views/projects/settings/_new_members.html.erb @@ -11,113 +11,113 @@
<% if members.any? %> -
    +
    • <%= 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 => "w90 c_orange fl" %> - + <%= link_to_user_header member.principal,false,:class => "w90 c_orange 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'}} - ) do |f| %> + <%= 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| %> -
        +
          <%= 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? } %>
        <% end %> - <%= hidden_field_tag 'membership[role_ids][]', '' %> -
        - - <%= l(:button_change)%> - - - <%= l(:button_cancel)%> - -
        + <%= hidden_field_tag 'membership[role_ids][]', '' %> +
        + + <%= l(:button_change)%> + + + <%= l(:button_cancel)%> + +
        <% end %> - <% unless member.user_id == @project.user_id %> - 编辑 - <%= 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_for_project_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %> - <% end%> - + <% unless member.user_id == @project.user_id %> + 编辑 + <%= 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_for_project_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %> + <% end%> + <% end%> -
      +
    <% else %> -

    <%= l(:label_no_data) %>

    +

    <%= l(:label_no_data) %>

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

<%= l(:label_apply_project) %>

- <%= form_for(@applied_members, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %> -
- <%= render_principals_for_applied_members_new(@project) %> -
-
    -
  • <%= l(:label_role_plural) %>:
    • - <% roles.each do |role| %> -
  • +
    + + <% if @project.applied_projects.any? %> +
    +

    <%= l(:label_apply_project) %>

    + <%= form_for(@applied_members, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %> +
    + <%= render_principals_for_applied_members_new(@project) %> +
    +
      +
    • <%= l(:label_role_plural) %>:
      • + <% roles.each do |role| %> +
    • <%= check_box_tag 'membership[role_ids][]', role.id %> -
      • - <% end %> -
    - - <%= l(:label_approve) %> - - - <%= l(:label_refusal) %> - - <% end %> -
    -
    - <% 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') }')" %> -
    +
    • + <% end %> +
+ + <%= l(:label_approve) %> + + + <%= l(:label_refusal) %> + + <% end %> +
+
+ <% 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) %> -
-
+
+ <%= render_principals_for_new_project_members(@project) %> +
+
-
    -
  • - <%= l(:label_role_plural) %>： -
    • - <% roles.each do |role| %> -
  • - <%= check_box_tag 'membership[role_ids][]', role.id %> - +
      +
    • + <%= l(:label_role_plural) %>：
      • - <% end %> -
    -
    - - 新增成员 - -
- <% end%> -
+ <% roles.each do |role| %> +
  • + <%= check_box_tag 'membership[role_ids][]', role.id %> + +
    • + <% end %> + +
    + + 新增成员 + + + <% end%> + <% end %>