From cc30093e5c241a327fc720717d19e9b5e227f626 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 27 Sep 2016 09:21:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E3=80=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=88=90=E5=91=98=E6=A0=B7=E5=BC=8F=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_project_top.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_base_project_top.html.erb b/app/views/layouts/_base_project_top.html.erb index 3b4cfa6e3..c99155fad 100644 --- a/app/views/layouts/_base_project_top.html.erb +++ b/app/views/layouts/_base_project_top.html.erb @@ -35,8 +35,8 @@ <% end %> 浏览：<%= @project.visits.to_i %> - <%= l(:label_user_watcher) %>: <%= link_to "#{@project.watcher_users.count}", {:controller=>"projects", :action=>"watcherlist", :id => @project.id}, :class => 'sy_corange' %> - <%= l(:label_member) %>: <%= link_to "#{@project.members.count}", project_member_path(@project), :class => 'sy_corange', :id => 'project_members_number' %> + 关注：<%= link_to "#{@project.watcher_users.count}", {:controller=>"projects", :action=>"watcherlist", :id => @project.id}, :class => 'sy_corange' %> + 成员：<%= link_to "#{@project.members.count}", project_member_path(@project), :class => 'sy_corange', :id => 'project_members_number' %>

<%= render 'layouts/join_exit_project' %> From 173a0971ac322780c01541c583b28e177c60952f Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 27 Sep 2016 09:31:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=B0=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/my/save_user_avatar.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/my/save_user_avatar.js.erb b/app/views/my/save_user_avatar.js.erb index 9e8a58e51..7bc4ab632 100644 --- a/app/views/my/save_user_avatar.js.erb +++ b/app/views/my/save_user_avatar.js.erb @@ -7,7 +7,7 @@ if($("#course_avatar_form").length > 0) { window.location.href = "<%=settings_course_path(@course) %>"; } <% elsif @project %> -$("#nh_source_tx").replaceWith('<%= image_tag(url_to_avatar(@project), :id=>'nh_source_tx',:style=>"width:60px;height:60px;overflow:hidden",:alt=>"项目logo") %>'); +$("#nh_source_tx").replaceWith('<%= image_tag(url_to_avatar(@project), :id=>'nh_source_tx',:style=>"width:110px;height:110px;overflow:hidden",:alt=>"项目logo") %>'); if($("#project_avatar_form").length > 0) { window.location.href = "<%=settings_project_path(@project) %>"; } From eaa6e9100e4efd9bbb67cf799afd6e0a2a39d85b Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 27 Sep 2016 09:41:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89module=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E2=80=9C=E6=96=87=E6=A1=A3=E2=80=9D=EF=BC=8C=E2=80=9C=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=B7=9F=E8=B8=AA=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/redmine.rb | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/redmine.rb b/lib/redmine.rb index 48269ba9c..e2dc8da0a 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -187,13 +187,13 @@ Redmine::AccessControl.map do |map| map.permission :delete_issue_watchers, {:watchers => :destroy} end - map.project_module :time_tracking do |map| - map.permission :log_time, {:timelog => [:new, :create]}, :require => :loggedin - map.permission :view_time_entries, {:timelog => [:index, :report, :show]}, :read => true - map.permission :edit_time_entries, {:timelog => [:edit, :update, :destroy, :bulk_edit, :bulk_update]}, :require => :member - map.permission :edit_own_time_entries, {:timelog => [:edit, :update, :destroy,:bulk_edit, :bulk_update]}, :require => :loggedin - map.permission :manage_project_activities, {:project_enumerations => [:update, :destroy]}, :require => :member - end + # map.project_module :time_tracking do |map| + # map.permission :log_time, {:timelog => [:new, :create]}, :require => :loggedin + # map.permission :view_time_entries, {:timelog => [:index, :report, :show]}, :read => true + # map.permission :edit_time_entries, {:timelog => [:edit, :update, :destroy, :bulk_edit, :bulk_update]}, :require => :member + # map.permission :edit_own_time_entries, {:timelog => [:edit, :update, :destroy,:bulk_edit, :bulk_update]}, :require => :loggedin + # map.permission :manage_project_activities, {:project_enumerations => [:update, :destroy]}, :require => :member + # end map.project_module :news do |map| map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member @@ -207,12 +207,12 @@ Redmine::AccessControl.map do |map| map.permission :notificationcomment_contestnotifications, {:notificationcomments => :create},:belong_to_contest => true end - map.project_module :documents do |map| - map.permission :add_documents, {:documents => [:new, :create, :add_attachment]}, :require => :loggedin - map.permission :edit_documents, {:documents => [:edit, :update, :add_attachment]}, :require => :loggedin - map.permission :delete_documents, {:documents => [:destroy]}, :require => :loggedin - map.permission :view_documents, {:documents => [:index, :show, :download]}, :read => true - end + # map.project_module :documents do |map| + # map.permission :add_documents, {:documents => [:new, :create, :add_attachment]}, :require => :loggedin + # map.permission :edit_documents, {:documents => [:edit, :update, :add_attachment]}, :require => :loggedin + # map.permission :delete_documents, {:documents => [:destroy]}, :require => :loggedin + # map.permission :view_documents, {:documents => [:index, :show, :download]}, :read => true + # end map.project_module :files do |map| map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin From 11c3c95c633072dce3ca75f3b01643936ad41cbc Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 27 Sep 2016 09:49:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?module=E4=B8=AD=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index bf4ced4c6..95125cd11 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1863,6 +1863,10 @@ module ApplicationHelper content_tag(:a, name, {:href => '#', :onclick => "#{function}; return false;"}.merge(:class => "BlueCirBtnMini ml10",:style => "display:inline-block; height:20px; line-height:20px;")) end + def link_to_function_none(name, function, html_options={}) + content_tag(:a, name, {:href => '#', :onclick => "#{function}; return false;"}.merge(:style => "display:inline-block; height:20px; line-height:20px;")) + end + # Helper to render JSON in views def raw_json(arg) arg.to_json.to_s.gsub('/', '\/').html_safe @@ -1882,8 +1886,8 @@ module ApplicationHelper end def check_all_links(form_name) - link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") + "  ".html_safe + " | "+ "  ".html_safe + - link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)") + link_to_function_none(l(:button_check_all), "checkAll('#{form_name}', true)") + "  ".html_safe + " | "+ "  ".html_safe + + link_to_function_none(l(:button_uncheck_all), "checkAll('#{form_name}', false)") end # 本次修改，修改为只显示关闭的所占%比