From 8faaf7ac3a66f98e6fcc8846c2bf75480e4bb95a Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Sat, 9 May 2020 15:29:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E6=90=9C=E7=B4=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issue_times_controller.rb | 12 +++--------- app/controllers/projects_controller.rb | 6 +++++- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/controllers/issue_times_controller.rb b/app/controllers/issue_times_controller.rb index 7b6dadfe7..1ddc66d9e 100644 --- a/app/controllers/issue_times_controller.rb +++ b/app/controllers/issue_times_controller.rb @@ -22,16 +22,10 @@ class IssueTimesController < ApplicationController end_type = params[:end_type].to_i end_work_time = end_type == 0 ? "" : Time.now last_work_time = @issue.issue_times.where(user_id: current_user.id, end_time: nil) - Rails.logger.info("######________last_work_time&.last.try(:id)_____###########{last_work_time&.first.try(:id)}") - if last_work_time.update_all(end_time: end_work_time) - if end_type == 0 - message = "取消时间跟踪" - @issue.custom_journal_detail("cancel_time",last_work_time&.first.try(:id), "取消时间跟踪", current_user&.id) - else - message = "停止工作" - @issue.custom_journal_detail("end_time",last_work_time&.first.try(:id), "停止工作", current_user&.id) - end + message = end_type == 0 ? "取消时间跟踪" : "停止工作" + journal_time = end_type == 0 ? "cancel_time" : "end_time" + @issue.custom_journal_detail(journal_time,last_work_time&.first.try(:id), message, current_user&.id) normal_status(0, message) else normal_status(0, "操作失败") diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 879efcaaf..a1e1e4b09 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -7,9 +7,13 @@ class ProjectsController < ApplicationController def index scope = Projects::ListQuery.call(params) + Rails.logger.info("#######_____scope__ids_____######{scope.pluck(:id)}") @total_count = scope.size - @projects = paginate(scope) + Rails.logger.info("#######______total_count______######{@total_count}") + page = params[:page] || 1 + limit = params[:limit] || 15 + @projects = scope.page(page).per(limit) end def create From da3a89c20cfd5c1fc0a931b647d794421383c293 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Sat, 9 May 2020 15:38:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95projects=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E7=9A=84=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index a1e1e4b09..12af65a50 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -7,13 +7,13 @@ class ProjectsController < ApplicationController def index scope = Projects::ListQuery.call(params) - Rails.logger.info("#######_____scope__ids_____######{scope.pluck(:id)}") - @total_count = scope.size Rails.logger.info("#######______total_count______######{@total_count}") page = params[:page] || 1 limit = params[:limit] || 15 - @projects = scope.page(page).per(limit) + projects = scope.page(page).per(limit) + Rails.logger.info("#######_____projects_ids______######{projects.pluck(:id)}") + @projects = projects end def create From 2f9868432481698fc8a43bc5742195a3e2742d41 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Sat, 9 May 2020 15:44:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95projects=5Findex=E7=9A=84?= =?UTF-8?q?search=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 7 +---- .../projects/_project_item.json.jbuilder | 25 ++++++++++++++++ app/views/projects/index.json.jbuilder | 29 ++----------------- 3 files changed, 28 insertions(+), 33 deletions(-) create mode 100644 app/views/projects/_project_item.json.jbuilder diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 12af65a50..663157b51 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -8,12 +8,7 @@ class ProjectsController < ApplicationController def index scope = Projects::ListQuery.call(params) @total_count = scope.size - Rails.logger.info("#######______total_count______######{@total_count}") - page = params[:page] || 1 - limit = params[:limit] || 15 - projects = scope.page(page).per(limit) - Rails.logger.info("#######_____projects_ids______######{projects.pluck(:id)}") - @projects = projects + @projects = paginate(scope) end def create diff --git a/app/views/projects/_project_item.json.jbuilder b/app/views/projects/_project_item.json.jbuilder new file mode 100644 index 000000000..ba4adc412 --- /dev/null +++ b/app/views/projects/_project_item.json.jbuilder @@ -0,0 +1,25 @@ +user = project.owner +if user.present? + json.partial! 'project', project: project + json.author do + json.name user.try(:show_real_name) + json.login user.login + json.image_url url_to_avatar(project.owner) + end + json.category do + if project.project_category.blank? + json.nil! + else + json.id project.project_category.id + json.name project.project_category.name + end + end + json.language do + if project.project_language.blank? + json.nil! + else + json.id project.project_language.id + json.name project.project_language.name + end + end +end \ No newline at end of file diff --git a/app/views/projects/index.json.jbuilder b/app/views/projects/index.json.jbuilder index 4cb260fd6..6c90e7747 100644 --- a/app/views/projects/index.json.jbuilder +++ b/app/views/projects/index.json.jbuilder @@ -1,30 +1,5 @@ +json.project_ids @projects.pluck(:id) json.total_count @total_count json.projects do - json.array! @projects.to_a do |project| - user = project.owner - if user.present? - json.partial! 'project', project: project - json.author do - json.name user.try(:show_real_name) - json.login user.login - json.image_url url_to_avatar(project.owner) - end - json.category do - if project.project_category.blank? - json.nil! - else - json.id project.project_category.id - json.name project.project_category.name - end - end - json.language do - if project.project_language.blank? - json.nil! - else - json.id project.project_language.id - json.name project.project_language.name - end - end - end - end + json.partial! "/projects/project_item", collection: @projects, as: :porject end From f0da03ef948760a8a199dd9df7c6ce0472af5392 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Sat, 9 May 2020 15:46:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_project_item.json.jbuilder | 2 +- app/views/projects/index.json.jbuilder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/projects/_project_item.json.jbuilder b/app/views/projects/_project_item.json.jbuilder index ba4adc412..c8093b7aa 100644 --- a/app/views/projects/_project_item.json.jbuilder +++ b/app/views/projects/_project_item.json.jbuilder @@ -1,6 +1,6 @@ user = project.owner if user.present? - json.partial! 'project', project: project + json.partial! '/projects/project', project: project json.author do json.name user.try(:show_real_name) json.login user.login diff --git a/app/views/projects/index.json.jbuilder b/app/views/projects/index.json.jbuilder index 6c90e7747..f35476d20 100644 --- a/app/views/projects/index.json.jbuilder +++ b/app/views/projects/index.json.jbuilder @@ -1,5 +1,5 @@ json.project_ids @projects.pluck(:id) json.total_count @total_count json.projects do - json.partial! "/projects/project_item", collection: @projects, as: :porject + json.partial! "/projects/project_item", collection: @projects, as: :project end