From d87f44e9395676c85223ea17ab015d71b75eb9d5 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 27 May 2020 18:25:32 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=9A=84=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E4=BF=AE=E6=94=B9/=E5=88=A0=E9=99=A4=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 39 +++++++++++++++++++++++++++- app/forms/contents/update_form.rb | 2 +- config/routes.rb | 2 ++ 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 633d973b5..e4e37fd2c 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -251,13 +251,50 @@ class IssuesController < ApplicationController end def destroy - if @issue.delete + if @issue.destroy normal_status(0, "删除成功") else normal_status(-1, "删除失败") end end + def clean + begin + issue_ids = params[:ids] + if issue_ids.present? + if Issue.where(id: issue_ids).destroy_all + normal_status(0, "删除成功") + else + normal_status(-1, "删除失败") + end + else + normal_status(-1, "请选择任务") + end + rescue Exception => e + normal_status(-1, "批量删除失败") + raise ActiveRecord::Rollback + end + end + + def series_update + begin + issue_ids = params[:ids] + update_params = params[:update_params] + if issue_ids.present? + if Issue.where(id: issue_ids).update_all(update_params) + normal_status(0, "批量更新成功") + else + normal_status(-1, "批量更新失败") + end + else + normal_status(-1, "请选择任务") + end + rescue Exception => e + normal_status(-1, "批量更新失败") + raise ActiveRecord::Rollback + end + end + def copy @new_issue = @issue.dup if @new_issue.save diff --git a/app/forms/contents/update_form.rb b/app/forms/contents/update_form.rb index 8600f0fde..75ae6fc58 100644 --- a/app/forms/contents/update_form.rb +++ b/app/forms/contents/update_form.rb @@ -7,7 +7,7 @@ class Contents::UpdateForm < BaseForm def check_branch raise "branch和new_branch必须存在一个 " if branch.blank? && new_branch.blank? - raise "branch和new_branch只能存在一个" if !branch.blank? && !new_branch.blank? + # raise "branch和new_branch只能存在一个" if !branch.blank? && !new_branch.blank? end end diff --git a/config/routes.rb b/config/routes.rb index f9f932cdd..d9dba0b92 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -70,6 +70,8 @@ Rails.application.routes.draw do collection do get :commit_issues get :index_chosen + post :clean + post :series_update end member do post :copy From e42e9f262ad6cdae15a12e8be006281237a6b478 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 10:05:07 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 44 +++++++++++----------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index e4e37fd2c..1b0cd34a5 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -259,39 +259,29 @@ class IssuesController < ApplicationController end def clean - begin - issue_ids = params[:ids] - if issue_ids.present? - if Issue.where(id: issue_ids).destroy_all - normal_status(0, "删除成功") - else - normal_status(-1, "删除失败") - end - else - normal_status(-1, "请选择任务") + issue_ids = params[:ids] + if issue_ids.present? + if Issue.where(id: issue_ids).destroy_all + normal_status(0, "删除成功") + else + normal_status(-1, "删除失败") end - rescue Exception => e - normal_status(-1, "批量删除失败") - raise ActiveRecord::Rollback + else + normal_status(-1, "请选择任务") end end def series_update - begin - issue_ids = params[:ids] - update_params = params[:update_params] - if issue_ids.present? - if Issue.where(id: issue_ids).update_all(update_params) - normal_status(0, "批量更新成功") - else - normal_status(-1, "批量更新失败") - end - else - normal_status(-1, "请选择任务") + issue_ids = params[:ids] + update_params = params[:update_params] + if issue_ids.present? + if Issue.where(id: issue_ids).update_all(update_params) + normal_status(0, "批量更新成功") + else + normal_status(-1, "批量更新失败") end - rescue Exception => e - normal_status(-1, "批量更新失败") - raise ActiveRecord::Rollback + else + normal_status(-1, "请选择任务") end end From 97dc5230520a2fbdd4b4c6e378290c6c27fa9d1e Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 10:07:31 +0800 Subject: [PATCH 03/22] change update bug --- app/controllers/issues_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 1b0cd34a5..c2d2333e0 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -275,7 +275,9 @@ class IssuesController < ApplicationController issue_ids = params[:ids] update_params = params[:update_params] if issue_ids.present? - if Issue.where(id: issue_ids).update_all(update_params) + if update_params.blank? + normal_status(-1, "请选择批量更新内容") + elsif Issue.where(id: issue_ids).update_all(update_params) normal_status(0, "批量更新成功") else normal_status(-1, "批量更新失败") From a4d8ef79b5916b25203f0c94c8b8fc039442da7d Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 10:23:00 +0800 Subject: [PATCH 04/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9update=5Fparams?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index c2d2333e0..7729ba4b4 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -273,11 +273,12 @@ class IssuesController < ApplicationController def series_update issue_ids = params[:ids] - update_params = params[:update_params] + new_update_params = params[:update_params] + Rails.logger.info("'#########____________#########{new_update_params}'") if issue_ids.present? - if update_params.blank? + if new_update_params.blank? normal_status(-1, "请选择批量更新内容") - elsif Issue.where(id: issue_ids).update_all(update_params) + elsif Issue.where(id: issue_ids).update_all(new_update_params) normal_status(0, "批量更新成功") else normal_status(-1, "批量更新失败") From 145c028df031e886fd6f349064c2742abc12d1a1 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 10:31:20 +0800 Subject: [PATCH 05/22] change bug --- app/controllers/issues_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 7729ba4b4..a946055d6 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -273,7 +273,9 @@ class IssuesController < ApplicationController def series_update issue_ids = params[:ids] - new_update_params = params[:update_params] + new_update_params = params[:change_update] + Rails.logger.info("'#########_____params_______#########{params}'") + Rails.logger.info("'#########____________#########{new_update_params}'") if issue_ids.present? if new_update_params.blank? From 22e26a96bdb956aa631f9a5fb57e6188d22e5f54 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 10:37:49 +0800 Subject: [PATCH 06/22] change bug --- app/controllers/issues_controller.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index a946055d6..35bbeecab 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -272,11 +272,9 @@ class IssuesController < ApplicationController end def series_update + params.permit! issue_ids = params[:ids] - new_update_params = params[:change_update] - Rails.logger.info("'#########_____params_______#########{params}'") - - Rails.logger.info("'#########____________#########{new_update_params}'") + new_update_params = params[:update_params] if issue_ids.present? if new_update_params.blank? normal_status(-1, "请选择批量更新内容") From 6f9975de044767f8bf17a27a16ce2c8cf5ccb196 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 10:42:05 +0800 Subject: [PATCH 07/22] change bug --- app/controllers/issues_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 35bbeecab..bee52b373 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -272,7 +272,7 @@ class IssuesController < ApplicationController end def series_update - params.permit! + params.permit!(:ids, :update_params, :project_id) issue_ids = params[:ids] new_update_params = params[:update_params] if issue_ids.present? From ddf3c4f75ebec6f6b78604cbe072b524bef2c832 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 10:44:13 +0800 Subject: [PATCH 08/22] change bug2 --- app/controllers/issues_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index bee52b373..52e9bbda7 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -272,7 +272,10 @@ class IssuesController < ApplicationController end def series_update - params.permit!(:ids, :update_params, :project_id) + Rails.logger.info("#######_______first_params______########{params}") + + params.permit(:ids, :update_params, :project_id) + Rails.logger.info("#######_________params______########{params}") issue_ids = params[:ids] new_update_params = params[:update_params] if issue_ids.present? From 444c2706f994c336ff0f2cae65329131c59d9e2a Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 10:45:49 +0800 Subject: [PATCH 09/22] change bug3 --- app/controllers/issues_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 52e9bbda7..166c2e6e6 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -274,10 +274,10 @@ class IssuesController < ApplicationController def series_update Rails.logger.info("#######_______first_params______########{params}") - params.permit(:ids, :update_params, :project_id) + params.permit! Rails.logger.info("#######_________params______########{params}") issue_ids = params[:ids] - new_update_params = params[:update_params] + new_update_params = eval(params[:update_params]) if issue_ids.present? if new_update_params.blank? normal_status(-1, "请选择批量更新内容") From ea2074386b844fbb864d18845c271f050965864c Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 10:50:14 +0800 Subject: [PATCH 10/22] change bug4 --- app/controllers/issues_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 166c2e6e6..22d3e4cd5 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -274,10 +274,11 @@ class IssuesController < ApplicationController def series_update Rails.logger.info("#######_______first_params______########{params}") - params.permit! - Rails.logger.info("#######_________params______########{params}") + # params.permit! + # Rails.logger.info("#######_________params______########{params}") issue_ids = params[:ids] - new_update_params = eval(params[:update_params]) + new_update_params = params[:contents] + Rails.logger.info("#######______new_update_params______########{new_update_params.to_h}") if issue_ids.present? if new_update_params.blank? normal_status(-1, "请选择批量更新内容") From 78ff06a41e16982c111fea55851d0418f4934478 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 10:59:42 +0800 Subject: [PATCH 11/22] change --- app/controllers/issues_controller.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 22d3e4cd5..7cb66b9c2 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -274,11 +274,10 @@ class IssuesController < ApplicationController def series_update Rails.logger.info("#######_______first_params______########{params}") - # params.permit! - # Rails.logger.info("#######_________params______########{params}") + params.permit! + Rails.logger.info("#######_________params______########{params}") issue_ids = params[:ids] - new_update_params = params[:contents] - Rails.logger.info("#######______new_update_params______########{new_update_params.to_h}") + new_update_params = params[:update_params] if issue_ids.present? if new_update_params.blank? normal_status(-1, "请选择批量更新内容") From 344572209388b6b2fea6803b88cd06968fa8334b Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 11:05:29 +0800 Subject: [PATCH 12/22] change bug4 --- app/controllers/issues_controller.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 7cb66b9c2..78408c3f2 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -272,16 +272,16 @@ class IssuesController < ApplicationController end def series_update - Rails.logger.info("#######_______first_params______########{params}") - - params.permit! - Rails.logger.info("#######_________params______########{params}") - issue_ids = params[:ids] - new_update_params = params[:update_params] + update_hash = {} + update_hash.merge(author_id: params[:author_id]) if params[:author_id].present? + update_hash.merge(fixed_version_id: params[:fixed_version_id]) if params[:fixed_version_id].present? + update_hash.merge(status_id: params[:status_id]) if params[:status_id].present? + + issue_ids = unsafe_params[:ids] if issue_ids.present? - if new_update_params.blank? + if update_hash.blank? normal_status(-1, "请选择批量更新内容") - elsif Issue.where(id: issue_ids).update_all(new_update_params) + elsif Issue.where(id: issue_ids).update_all(update_hash) normal_status(0, "批量更新成功") else normal_status(-1, "批量更新失败") From a02ae6d06a00ff7f912b186b063c273e6165a0ea Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 11:06:41 +0800 Subject: [PATCH 13/22] change bug5 --- app/controllers/issues_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 78408c3f2..80c73fa3f 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -277,7 +277,7 @@ class IssuesController < ApplicationController update_hash.merge(fixed_version_id: params[:fixed_version_id]) if params[:fixed_version_id].present? update_hash.merge(status_id: params[:status_id]) if params[:status_id].present? - issue_ids = unsafe_params[:ids] + issue_ids = params[:ids] if issue_ids.present? if update_hash.blank? normal_status(-1, "请选择批量更新内容") From 19404c217b94ea01e4c7e4e8023df471fda01a52 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 11:09:10 +0800 Subject: [PATCH 14/22] change update_hash --- app/controllers/issues_controller.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 80c73fa3f..7dd12e56d 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -272,11 +272,11 @@ class IssuesController < ApplicationController end def series_update - update_hash = {} - update_hash.merge(author_id: params[:author_id]) if params[:author_id].present? - update_hash.merge(fixed_version_id: params[:fixed_version_id]) if params[:fixed_version_id].present? - update_hash.merge(status_id: params[:status_id]) if params[:status_id].present? - + # update_hash = {} + # update_hash.merge(author_id: params[:author_id]) if params[:author_id].present? + # update_hash.merge(fixed_version_id: params[:fixed_version_id]) if params[:fixed_version_id].present? + # update_hash.merge(status_id: params[:status_id]) if params[:status_id].present? + update_hash = params[:issue] issue_ids = params[:ids] if issue_ids.present? if update_hash.blank? From 7ca4433a91a00bb71143562a925e2c02c295bce5 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 11:18:04 +0800 Subject: [PATCH 15/22] chang params --- app/controllers/issues_controller.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 7dd12e56d..da0bd8381 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -272,11 +272,12 @@ class IssuesController < ApplicationController end def series_update - # update_hash = {} - # update_hash.merge(author_id: params[:author_id]) if params[:author_id].present? - # update_hash.merge(fixed_version_id: params[:fixed_version_id]) if params[:fixed_version_id].present? - # update_hash.merge(status_id: params[:status_id]) if params[:status_id].present? - update_hash = params[:issue] + + update_hash = {} + update_hash.merge!(author_id: params[:author_id]) if params[:author_id].present? + update_hash.merge!(fixed_version_id: params[:fixed_version_id]) if params[:fixed_version_id].present? + update_hash.merge!(status_id: params[:status_id]) if params[:status_id].present? + # update_hash = params[:issue] issue_ids = params[:ids] if issue_ids.present? if update_hash.blank? From dd871ba48110ba5a103625ec0f3a0ecbbae05bab Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 11:28:42 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=9F=E8=B4=A3?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index da0bd8381..efeca3cee 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -274,7 +274,7 @@ class IssuesController < ApplicationController def series_update update_hash = {} - update_hash.merge!(author_id: params[:author_id]) if params[:author_id].present? + update_hash.merge!(assigned_to_id: params[:assigned_to_id]) if params[:assigned_to_id].present? update_hash.merge!(fixed_version_id: params[:fixed_version_id]) if params[:fixed_version_id].present? update_hash.merge!(status_id: params[:status_id]) if params[:status_id].present? # update_hash = params[:issue] From c141e510b85f30e701f1659a688fea2337eda5bf Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 18:11:38 +0800 Subject: [PATCH 17/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0children=5Fjournals?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 2 +- app/controllers/journals_controller.rb | 10 +++++++++- app/views/journals/_journal_item.json.jbuilder | 1 - app/views/journals/get_children_journals.json.jbuilder | 8 ++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 app/views/journals/get_children_journals.json.jbuilder diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index efeca3cee..6481dcc42 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -447,7 +447,7 @@ class IssuesController < ApplicationController status_id: params[:status_id], priority_id: params[:priority_id], fixed_version_id: params[:fixed_version_id], - start_date: params[:start_date].to_s.to_date, + start_date: params[:start_date].to_s.to_date || Time.current.to_date, due_date: params[:due_date].to_s.to_date, estimated_hours: params[:estimated_hours], done_ratio: params[:done_ratio], diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index 8803634ef..785d181ea 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -1,6 +1,6 @@ class JournalsController < ApplicationController before_action :require_login, except: :index - before_action :set_issue + before_action :set_issue, except: :get_children_journals before_action :check_issue_permission before_action :set_journal, only: [:destroy, :edit, :update] @@ -73,6 +73,14 @@ class JournalsController < ApplicationController end + def get_children_journals + @page = params[:page] || 1 + @limit = params[:limit] || 10 + journals = Journal.children_journals(params[:parent_id]).journal_includes.order("created_on desc") + @journals_size = journals.size + @children_journals = journals.page(@page).per(@limit) + end + private diff --git a/app/views/journals/_journal_item.json.jbuilder b/app/views/journals/_journal_item.json.jbuilder index 03fd35c7b..7522d915f 100644 --- a/app/views/journals/_journal_item.json.jbuilder +++ b/app/views/journals/_journal_item.json.jbuilder @@ -4,7 +4,6 @@ json.user_login journal.user.try(:login) json.user_picture url_to_avatar(journal.user) json.is_journal_detail journal.is_journal_detail? #判断是否修改了参数而添加的回复内容 json.content journal.try(:notes) -json.children_journals children_content(journal.id) json.journal_details journal.journal_content json.format_time format_time(journal.created_on) json.created_at time_from_now(journal.created_on) diff --git a/app/views/journals/get_children_journals.json.jbuilder b/app/views/journals/get_children_journals.json.jbuilder new file mode 100644 index 000000000..a46c6f755 --- /dev/null +++ b/app/views/journals/get_children_journals.json.jbuilder @@ -0,0 +1,8 @@ +json.partial! "commons/success" +json.limit @limit +json.journals_count @journals_size +json.issue_journals do + json.array! @children_journals do |journal| + json.partial! "journals/journal_item", journal: journal + end +end \ No newline at end of file From 70f836f988ec1d31bba116f79061c1726c05f895 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 18:14:10 +0800 Subject: [PATCH 18/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0journal=20=E8=B7=AF?= =?UTF-8?q?=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/routes.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index d9dba0b92..622c7ad73 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -29,7 +29,11 @@ Rails.application.routes.draw do delete 'commons/delete', to: 'commons#delete' resources :issues, except: [:index, :new,:create, :update, :edit, :destroy] do - resources :journals, only: [:index, :create, :destroy, :edit, :update] + resources :journals, only: [:index, :create, :destroy, :edit, :update] do + member do + get :get_children_journals + end + end resources :issue_times, only: [:create] do collection do post :end_work From bed4d934934f7dde1c2233ccbc133a860f8fee6f Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 18:30:22 +0800 Subject: [PATCH 19/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=AD=90=E8=AF=84?= =?UTF-8?q?=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/journals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index 785d181ea..b12e3ac36 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -1,6 +1,6 @@ class JournalsController < ApplicationController before_action :require_login, except: :index - before_action :set_issue, except: :get_children_journals + before_action :set_issue before_action :check_issue_permission before_action :set_journal, only: [:destroy, :edit, :update] From 1e9716b84a07fe2d46bccdaafdd941ed5ee89412 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 28 May 2020 18:32:36 +0800 Subject: [PATCH 20/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/journals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index b12e3ac36..d1501ac1d 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -76,7 +76,7 @@ class JournalsController < ApplicationController def get_children_journals @page = params[:page] || 1 @limit = params[:limit] || 10 - journals = Journal.children_journals(params[:parent_id]).journal_includes.order("created_on desc") + journals = Journal.children_journals(params[:id]).journal_includes.order("created_on desc") @journals_size = journals.size @children_journals = journals.page(@page).per(@limit) end From b9c12d8f5d4ef249d1e05121978e71a73f4a6dfe Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 29 May 2020 12:32:01 +0800 Subject: [PATCH 21/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9issues=E8=BF=94?= =?UTF-8?q?=E5=9B=9Ecount?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/journals_controller.rb | 10 +++++++--- app/views/journals/index.json.jbuilder | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index d1501ac1d..35690ea56 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -7,9 +7,13 @@ class JournalsController < ApplicationController def index @page = params[:page] || 1 @limit = params[:limit] || 10 - journals = @issue.journals.journal_includes.order("created_on desc") - @journals_size = journals.size - @journals = journals.parent_journals.page(@page).per(@limit) + total_journals = @issue.journals.journal_includes + @jounals_total = total_journals.size + parent_journals =journals.parent_journals.order("created_on desc") + @journals = parent_journals.order("created_on desc").page(@page).per(@limit) + @journals_size = parent_journals.size + + end def create diff --git a/app/views/journals/index.json.jbuilder b/app/views/journals/index.json.jbuilder index 2485e72bd..99df015c9 100644 --- a/app/views/journals/index.json.jbuilder +++ b/app/views/journals/index.json.jbuilder @@ -1,6 +1,7 @@ json.partial! "commons/success" json.limit @limit json.journals_count @journals_size +json.journals_total_count @jounals_total json.issue_journals do json.array! @journals do |journal| json.partial! "journals/journal_item", journal: journal From da1b56d85836b6d9e01f130821c5c6ff55cb55c9 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 29 May 2020 12:36:19 +0800 Subject: [PATCH 22/22] add total_journals --- app/controllers/journals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index 35690ea56..cce03edbe 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -9,7 +9,7 @@ class JournalsController < ApplicationController @limit = params[:limit] || 10 total_journals = @issue.journals.journal_includes @jounals_total = total_journals.size - parent_journals =journals.parent_journals.order("created_on desc") + parent_journals = total_journals.parent_journals.order("created_on desc") @journals = parent_journals.order("created_on desc").page(@page).per(@limit) @journals_size = parent_journals.size