From e7344b6540da7ba05d9aa37f8eea283cf25d9bca Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 27 Sep 2016 09:13:40 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E6=95=B0=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_project_top.html.erb | 3 ++- app/views/layouts/base_projects.html.erb | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/_base_project_top.html.erb b/app/views/layouts/_base_project_top.html.erb index 820a004de..3b4cfa6e3 100644 --- a/app/views/layouts/_base_project_top.html.erb +++ b/app/views/layouts/_base_project_top.html.erb @@ -11,7 +11,8 @@ <% end %> - + <%# 更新访问数,刷新的时候更新访问次数 %> + <% update_visiti_count @project %>

<%= l(:label_project_ivite_code)%>
<%= (User.current.member_of?(@project) || User.current.admin?) ? @project.invite_code : "******" %>

diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 969db6961..b0de79d7c 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -49,8 +49,7 @@
<%= render :partial => 'layouts/base_project_top' %>
- <%# 更新访问数,刷新的时候更新访问次数 %> - <% update_visiti_count @project %> +
From b1496e18745e0c75af51632d97095365bf2daeff Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 27 Sep 2016 09:15:19 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=82=80=E8=AF=B7?= =?UTF-8?q?=E7=A0=81=E5=8E=BB=E6=8E=89=E5=86=92=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/projects/zh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index d0b4c1c23..3d5c26d45 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -48,7 +48,7 @@ zh: # 左边栏 # label_project_id: "项目ID:" - label_project_ivite_code: "邀请码:" + label_project_ivite_code: "邀请码" label_agree_join_project: 同意加入 label_apply_project: "+加入" From b2ed335146c69b930314f98f6ea032fa34fd948f Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 27 Sep 2016 09:16:11 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9issue=E6=8C=87=E6=B4=BE?= =?UTF-8?q?=E7=BB=99=E6=88=91=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/_project_issue.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/issues/_project_issue.html.erb b/app/views/issues/_project_issue.html.erb index 167fb2641..4f1f6c097 100644 --- a/app/views/issues/_project_issue.html.erb +++ b/app/views/issues/_project_issue.html.erb @@ -42,8 +42,8 @@
  • <% unless activity.assigned_to_id.nil? %> - <% if activity.try(:assigned_to).try(:realname) == ' ' %> - <%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "c_grey" %> + <% if activity.try(:assigned_to).try(:realname).empty? %> + <%= link_to activity.assigned_to, user_path(activity.assigned_to_id), :class => "c_grey" %> <% else %> <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "c_grey" %> <% end %> From cc30093e5c241a327fc720717d19e9b5e227f626 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 27 Sep 2016 09:21:41 +0800 Subject: [PATCH 04/18] =?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 05/18] =?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 06/18] =?UTF-8?q?=E5=8E=BB=E6=8E=89module=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E2=80=9C=E6=96=87=E6=A1=A3=E2=80=9D=EF=BC=8C=E2=80=9C?= =?UTF-8?q?=E6=97=B6=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 07/18] =?UTF-8?q?module=E4=B8=AD=E7=9A=84=E6=A0=B7?= =?UTF-8?q?=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 # 本次修改，修改为只显示关闭的所占%比 From 50741ad2a6149d3cd5a970070c5201546a3d9fda Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 27 Sep 2016 09:57:44 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E9=80=89=E4=B8=AD=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=82=B9=E6=B8=85=E9=99=A4=E6=88=96=E6=89=80?= =?UTF-8?q?=E6=9C=89=E5=A4=B1=E6=95=88=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/issues/index.html.erb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 469a3a843..ec5849abd 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -43,11 +43,11 @@ // } // }); } - function nh_reset_form() { - $("#issue_query_form")[0].reset(); - $("input[nhname='date_val']").val('');//涛哥的火狐reset 清不掉这个值 我擦 - remote_function(); - } + // function nh_reset_form() { + // $("#issue_query_form")[0].reset(); + // $("input[nhname='date_val']").val('');//涛哥的火狐reset 清不掉这个值 我擦 + // remote_function(); + // } function EnterPress(e){ var e = e || window.event; @@ -58,9 +58,9 @@ // 点击的时候让过滤条件选中assign_to function switch_assign_to(assign) { - var assign = "option[value =" + assign + "]" + var assign = "option[value =" + assign + "]"; $("#issues_type_2").click(function(){ - + $("select[id='author_id']").val(''); }); $("select[id='assigned_to_id']").find(assign).attr("selected", "selected"); remote_function(); @@ -68,18 +68,19 @@ // 点击的时候让过滤条件选中user_id function createByMe(user_id) { - var user = "option[value =" + user_id + "]" + var user = "option[value =" + user_id + "]"; $("#createByMe").click(function(){ }); $("select[id='author_id']").find(user).attr("selected", "selected"); remote_function(); } - + // 清楚表单所有选项 function all_reset_form() { $("#issue_query_form")[0].reset(); $("select[id='author_id']").val(''); $("select[id='assigned_to_id']").val(''); + $("input[nhname='date_val']").val(''); remote_function(); } From a06b5f0bb969ffc7ad5424833bf3e04ba1bac212 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 27 Sep 2016 10:38:35 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=AF=84=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/_form.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb index d58c4fb6f..5a0820092 100644 --- a/app/views/issues/_form.html.erb +++ b/app/views/issues/_form.html.erb @@ -18,10 +18,10 @@ <% end %>
    • -
  • - - -
    • + + + +
    From 1c33e6481f8fb2a0c1492c42f1bf9d8c7ec211aa Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 27 Sep 2016 10:48:39 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E9=97=AE=E9=A2=98issue=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8F=8A=E5=85=B6=E5=8A=A8=E6=80=81=E7=9A=84=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=94=B9=E4=B8=BA=E9=87=8C=E7=A8=8B=E7=A2=91?= =?UTF-8?q?=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/_attributes.html.erb | 2 +- app/views/issues/_attributes_show.html.erb | 2 +- app/views/issues/index.html.erb | 6 +++--- app/views/users/_project_issue_detail.html.erb | 2 +- config/locales/projects/zh.yml | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb index 80c8ad185..f7d7b4d50 100644 --- a/app/views/issues/_attributes.html.erb +++ b/app/views/issues/_attributes.html.erb @@ -44,7 +44,7 @@
  • <% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %> - + <%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), {:include_blank => true, :required => @issue.required_attribute?('fixed_version_id'), :no_label => true}, :class => "w150" %> diff --git a/app/views/issues/_attributes_show.html.erb b/app/views/issues/_attributes_show.html.erb index 15160facb..7ff59fd9d 100644 --- a/app/views/issues/_attributes_show.html.erb +++ b/app/views/issues/_attributes_show.html.erb @@ -40,7 +40,7 @@ <% end %>
    <% unless @issue.disabled_core_fields.include?('fixed_version_id') %> -

  •  目标版本  : 

    <%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %> +

  •  <%=l(:milestone)%>  : 

    <%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %>
    • <% end %>
    diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index ec5849abd..8552a65b2 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -91,9 +91,9 @@ 新 增
    导出EXCEL diff --git a/app/views/users/_project_issue_detail.html.erb b/app/views/users/_project_issue_detail.html.erb index 321ba663a..81df1500b 100644 --- a/app/views/users/_project_issue_detail.html.erb +++ b/app/views/users/_project_issue_detail.html.erb @@ -115,7 +115,7 @@ <%= format_date(activity.due_date)? format_date(activity.due_date) : "--" %>
  • -

     目标版本  : 

    +

     <%=l(:milestone)%>  : 

    <%= (activity.fixed_version ? link_to_user_version(activity.fixed_version) : "--") %>
    • diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 3d5c26d45..1d44cffba 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -236,6 +236,7 @@ zh: # 自定义查询> 过滤器类别 field_status: 状态 field_fixed_version: 目标版本 + milestone: 里程碑 field_assigned_to_role: 角色的成员 field_category: 类别 field_created_on: 创建于 From c339b3e4a3ee8773297ca91ba5204f0a892fab18 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 27 Sep 2016 11:59:48 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=94=98=E7=89=B9?= =?UTF-8?q?=E5=9B=BE=E4=B8=AD=E5=AF=BC=E5=87=BApdf=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/gantts/show.html.erb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb index 39ac2032b..4581199ce 100644 --- a/app/views/gantts/show.html.erb +++ b/app/views/gantts/show.html.erb @@ -294,10 +294,7 @@ -<% other_formats_links do |f| %> - <%= f.link_to 'PDF', :url => params.merge(@gantt.params) %> - <%= f.link_to('PNG', :url => params.merge(@gantt.params)) if @gantt.respond_to?('to_image') %> -<% end %> + <% end # query.valid? %> <% content_for :sidebar do %> From d2d0c263d7b3092fc4766234b7aa9f966e7f9477 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 27 Sep 2016 12:08:03 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AEissue?= =?UTF-8?q?=E5=AF=BC=E5=87=BAexcel=E7=9A=84=E6=97=B6=E9=97=B4=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E6=A0=BC=E5=BC=8F=E5=8F=8A=E7=9B=AE=E6=A0=87=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 95125cd11..8563f6f02 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -102,7 +102,7 @@ module ApplicationHelper sheet1 = book.create_worksheet :name => "issues" blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10 sheet1.row(0).default_format = blue - sheet1.row(0).concat([l(:issue_xls_id),l(:issue_xls_tracker_id),l(:issue_xls_title),l(:issue_xls_description),l(:issue_xls_status),l(:issue_xls_assign),l(:issue_xls_priority),l(:issue_xls_author),l(:issue_xls_created_at),l(:issue_xls_version),l(:issue_xls_start),l(:issue_xls_due),l(:issue_xls_ratio)]) + sheet1.row(0).concat([l(:issue_xls_id),l(:issue_xls_tracker_id),l(:issue_xls_title),l(:issue_xls_description),l(:issue_xls_status),l(:issue_xls_assign),l(:issue_xls_priority),l(:issue_xls_author),l(:issue_xls_created_at),l(:milestone),l(:issue_xls_start),l(:issue_xls_due),l(:issue_xls_ratio)]) count_row = 1 issues.each do |issue| sheet1[count_row,0] = issue.id @@ -113,10 +113,10 @@ module ApplicationHelper sheet1[count_row,5] = issue.assigned_to.try(:show_name) sheet1[count_row,6] = issue_priority_change(issue.priority_id) sheet1[count_row,7] = issue.author.show_name - sheet1[count_row,8] = issue.created_on + sheet1[count_row,8] = issue.created_on.nil? ? issue.created_on : issue.created_on.strftime('%Y-%m-%d %H:%M:%S') sheet1[count_row,9] = issue.fixed_version.try(:name) - sheet1[count_row,10] = issue.start_date - sheet1[count_row,11] = issue.due_date + sheet1[count_row,10] = issue.start_date.nil? ? issue.start_date : issue.start_date.strftime('%Y-%m-%d') + sheet1[count_row,11] = issue.due_date.nil? ? issue.due_date : issue.due_date.strftime('%Y-%m-%d') sheet1[count_row,12] = issue_ratio_change(issue.done_ratio, issue.status_id) count_row += 1 end From 405f4e0a20da1aaf2706940cf10a647aa773d33e Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 27 Sep 2016 13:36:04 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E7=94=98?= =?UTF-8?q?=E7=89=B9=E5=9B=BE=E7=9A=84=E6=94=BE=E5=A4=A7=E7=BC=A9=E5=B0=8F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/gantts/show.html.erb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb index 4581199ce..759f8c232 100644 --- a/app/views/gantts/show.html.erb +++ b/app/views/gantts/show.html.erb @@ -48,10 +48,10 @@
    -

    - <%= gantt_zoom_link(@gantt, :in) %> - <%= gantt_zoom_link(@gantt, :out) %> -

    + + + +

    <%= text_field_tag 'months', @gantt.months, :size => 2 %> @@ -99,9 +99,9 @@ t_height = g_height + headers_height %> -<% if @gantt.truncated %> -

    <%= l(:notice_gantt_chart_truncated, :max => @gantt.max_rows) %>

    -<% end %> +<%# if @gantt.truncated %> + +<%# end %> From e7bfc9ee60d3a19839bee0f027a8035b495a73a4 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 27 Sep 2016 13:37:34 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/show.html.erb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 4447e45a0..21db53a31 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -79,8 +79,9 @@ 如何提交代码
    - <%= link_to "代码统计：导出excel", {:controller => 'repositories', :action => 'export_rep_static', :format => 'xls', :rev => @rev } %>
    - + 导出统计结果： + <%= link_to "当前一周", {:controller => 'repositories', :action => 'export_rep_static', :format => 'xls', :rev => @rev, :cycle => "week" } %> | + <%= link_to "当前一月", {:controller => 'repositories', :action => 'export_rep_static', :format => 'xls', :rev => @rev, :cycle => "month" } %>
    <%#= link_to "导出excel", {:controller => 'repositories', :action => 'export_rep_static', :rev => @rev}, :format => 'xls' %> @@ -94,4 +95,4 @@ + From a020ab8cd361e6061560f81773bdc0292ad100fe Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 27 Sep 2016 14:27:32 +0800 Subject: [PATCH 15/18] =?UTF-8?q?Issue=E5=AF=BC=E5=87=BAexcel=E5=B8=A6html?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- app/views/issues/index.html.erb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8563f6f02..573a7ba1f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -108,7 +108,7 @@ module ApplicationHelper sheet1[count_row,0] = issue.id sheet1[count_row,1] = issue_tracker_change(issue.tracker_id) sheet1[count_row,2] = issue.subject - sheet1[count_row,3] = issue.description + sheet1[count_row,3] = (issue.description.gsub(/<\/?.*?>/,"")).html_safe sheet1[count_row,4] = issue_status_change(issue.status_id) sheet1[count_row,5] = issue.assigned_to.try(:show_name) sheet1[count_row,6] = issue_priority_change(issue.priority_id) diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 8552a65b2..271fb16c6 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -60,9 +60,10 @@ function switch_assign_to(assign) { var assign = "option[value =" + assign + "]"; $("#issues_type_2").click(function(){ - $("select[id='author_id']").val(''); + }); $("select[id='assigned_to_id']").find(assign).attr("selected", "selected"); + $("select[id='author_id']").val(''); remote_function(); } From 70d58ea28eb3f72ca2e6aca727d9b66c7ff8dbfb Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 27 Sep 2016 15:10:52 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=BB=A3=E7=A0=81=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 2 +- app/helpers/application_helper.rb | 18 ++++++++++-------- app/views/repositories/show.html.erb | 4 ++-- config/locales/projects/zh.yml | 3 ++- .../lib/gitlab/client/repositories.rb | 10 ++++++++++ 5 files changed, 25 insertions(+), 12 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 5d9528f87..d4042abf5 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -77,7 +77,7 @@ class RepositoriesController < ApplicationController respond_to do |format| format.html format.xls{ - filename = "#{@project.name.to_s}_#{l(:label_issue_list_xls)}_#{@rev}_#{l(:label_rep_xls)}.xls" + filename = "#{@project.name.to_s}_#{l(:label_rep_xls)}.xls" send_data(export_rep_xls(gpid, :rev => rev, :cycle => "1"), :type => 'application/octet-stream', :filename => filename_for_content_disposition(filename)) } end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8563f6f02..7ade73751 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -68,29 +68,31 @@ module ApplicationHelper g = Gitlab.client cycle = params[:cycle] rev = params[:rev] - # branch = g.branche(gpid, rev) - statics = g.rep_stats(gpid, :rev => rev) - + if cycle == "week" + statics = g.rep_stats_week(gpid, :rev => rev) + elsif cycle == "month" + statics = g.rep_stats_month(gpid, :rev => rev) + end xls_report = StringIO.new book = Spreadsheet::Workbook.new sheet1 = book.create_worksheet :name => "版本库" blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10 sheet1.row(0).default_format = blue - sheet1.row(0).concat([l(:rep_branch),l(:rep_author),l(:rep_author_mail),l(:rep_code_add),l(:rep_code_delete),l(:rep_code_modified),l(:rep_sode_time),l(:rep_sode_cycle)]) + sheet1.row(0).concat([l(:rep_branch),l(:rep_author),l(:rep_changeset),l(:rep_code_add),l(:rep_code_delete),l(:rep_code_modified),l(:rep_sode_time),l(:rep_sode_cycle),l(:rep_author_mail)]) count_row = 1 statics.each do |static| user = User.where(:mail => static.email).first sheet1[count_row,0] = rev sheet1[count_row,1] = user.nil? ? static.uname : user.show_name - sheet1[count_row,2] = static.email + sheet1[count_row,2] = static.commits_num sheet1[count_row,3] = static.add sheet1[count_row,4] = static.del sheet1[count_row,5] = static.changes - sheet1[count_row,6] = Time.now - sheet1[count_row,7] = "1周" + sheet1[count_row,6] = Time.now.strftime('%Y-%m-%d %H:%M:%S') + sheet1[count_row,7] = cycle == "week" ? "最近1周" : "最近一月" + sheet1[count_row,8] = static.email count_row += 1 end - book.write xls_report xls_report.string end diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 21db53a31..b12302e6e 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -80,8 +80,8 @@ 如何提交代码
    导出统计结果： - <%= link_to "当前一周", {:controller => 'repositories', :action => 'export_rep_static', :format => 'xls', :rev => @rev, :cycle => "week" } %> | - <%= link_to "当前一月", {:controller => 'repositories', :action => 'export_rep_static', :format => 'xls', :rev => @rev, :cycle => "month" } %> + <%= link_to "最近一周", {:controller => 'repositories', :action => 'export_rep_static', :format => 'xls', :rev => @rev, :cycle => "week" } %> | + <%= link_to "最近一月", {:controller => 'repositories', :action => 'export_rep_static', :format => 'xls', :rev => @rev, :cycle => "month" } %>
    <%#= link_to "导出excel", {:controller => 'repositories', :action => 'export_rep_static', :rev => @rev}, :format => 'xls' %> diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 1d44cffba..98e13a865 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -222,11 +222,12 @@ zh: rep_branch: 分支 rep_author: 作者 rep_author_mail: 邮箱 + rep_changeset: 提交次数 rep_code_add: 添加行数 rep_code_delete: 删除代码 rep_code_modified: 总行数 rep_sode_time: 导出时间 - rep_sode_cycle: 周期 + rep_sode_cycle: 时间区间 # 自定义查询 label_query_plural: 自定义查询 diff --git a/lib/gitlab-cli/lib/gitlab/client/repositories.rb b/lib/gitlab-cli/lib/gitlab/client/repositories.rb index 80d1058b5..daed2ee16 100644 --- a/lib/gitlab-cli/lib/gitlab/client/repositories.rb +++ b/lib/gitlab-cli/lib/gitlab/client/repositories.rb @@ -117,6 +117,16 @@ class Gitlab::Client end alias_method :repo_rep_stats, :rep_stats + def rep_stats_week(project, options={}) + get("/projects/#{project}/repository/rep_stats_week", :query => options) + end + alias_method :repo_rep_stats, :rep_stats + + def rep_stats_month(project, options={}) + get("/projects/#{project}/repository/rep_stats_month", :query => options) + end + alias_method :repo_rep_stats, :rep_stats + def rep_user_stats(project, options={}) get("/projects/#{project}/repository/rep_user_stats", :query => options) end From 8fb440c59309d267b76f2ee0be3dc49857aecc6c Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 27 Sep 2016 17:01:04 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E9=A1=B9=E7=9B=AEissue=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/_project_issue.html.erb | 11 ++++++++-- app/views/issues/index.html.erb | 26 +++++++++++++++--------- public/stylesheets/css/project.css | 5 +++-- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/app/views/issues/_project_issue.html.erb b/app/views/issues/_project_issue.html.erb index 4f1f6c097..cf04baa14 100644 --- a/app/views/issues/_project_issue.html.erb +++ b/app/views/issues/_project_issue.html.erb @@ -40,6 +40,13 @@ 周报 <% end %> +
  • <% unless activity.assigned_to_id.nil? %> <% if activity.try(:assigned_to).try(:realname).empty? %> @@ -48,8 +55,8 @@ <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "c_grey" %> <% end %> <% end %>
    • -
  • <%= activity.fixed_version %>
    • -
  • <%= activity.status.name%>
    • +
  • <%= activity.fixed_version %>
    • +
  • <%= activity.status.name%>
  • <%= activity.done_ratio %>%
  • <%= link_to "", issue_path(activity.id, :edit => 'true'), :class => 'sy_icons_edit fl mt15', :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project) %> diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 271fb16c6..256ea3378 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -4,7 +4,7 @@