From 0f0fc691d0a5fa5a2c2c4c0f64736d4736f93bdd Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 26 Feb 2020 17:44:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 2 +- app/controllers/issues_controller.rb | 11 ++++------- app/services/gitea/versions/delete_service.rb | 12 +----------- app/services/gitea/versions/update_service.rb | 2 +- 4 files changed, 7 insertions(+), 20 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index cb39a24f7..fe77a99f7 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -329,7 +329,7 @@ class ApplicationController < ActionController::Base def current_user # User.current if Rails.env.development? - user_id = 50207 + user_id = 36390 else user_id = 130328 end diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 5fdd17c8c..1435b1663 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -223,7 +223,10 @@ class IssuesController < ApplicationController } if params[:issue_tag_ids].present? && !@issue&.issue_tags_relates.where(issue_tag_id: params[:issue_tag_ids]).exists? - @issue&.issue_tags_relates&.delete_all + @issue&.issue_tags_relates&.destroy_all + params[:issue_tag_ids].each do |tag| + IssueTagsRelate.create(issue_id: @issue.id, issue_tag_id: tag) + end end if @issue.update_attributes(issue_params) @@ -258,12 +261,6 @@ class IssuesController < ApplicationController # end # end - if params[:issue_tag_ids].present? - params[:issue_tag_ids].each do |tag| - IssueTagsRelate.create(issue_id: @issue.id, issue_tag_id: tag) - end - end - if params[:status_id].to_i == 5 @issue.issue_times.update_all(end_time: Time.now) end diff --git a/app/services/gitea/versions/delete_service.rb b/app/services/gitea/versions/delete_service.rb index 537d8f1b5..ef6481a7e 100644 --- a/app/services/gitea/versions/delete_service.rb +++ b/app/services/gitea/versions/delete_service.rb @@ -10,7 +10,7 @@ class Gitea::Versions::DeleteService < Gitea::ClientService def call response = delete(url, params) - render_result(response) + return response end private @@ -23,14 +23,4 @@ class Gitea::Versions::DeleteService < Gitea::ClientService "/repos/#{@user_name}/#{@repo}/releases/#{@version_gid}".freeze end - def render_result(response) - body = JSON.parse(response.body) - case response.status - when 204 - body - else - {status: -1, message: "#{body['message']}"} - end - end - end diff --git a/app/services/gitea/versions/update_service.rb b/app/services/gitea/versions/update_service.rb index ddd73dd86..a4c9acfc2 100644 --- a/app/services/gitea/versions/update_service.rb +++ b/app/services/gitea/versions/update_service.rb @@ -19,7 +19,7 @@ class Gitea::Versions::UpdateService < Gitea::ClientService end def call - put(url, request_params) + patch(url, request_params) end private From 0bc2b5eb837271c4f5056430d0fa855396a317cf Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 26 Feb 2020 18:06:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=BA=93=E7=9A=84show=E9=A1=B5=E9=9D=A2=E7=9A=84=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/controllers/versions_controller.rb | 9 +++++++++ app/views/versions/show.json.jbuilder | 1 + 2 files changed, 10 insertions(+) diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index 70d60583e..1f9f57b91 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -29,7 +29,16 @@ class VersionsController < ApplicationController order_type = params[:order_type] || "desc" version_issues = @version.issues.issue_includes.order("#{order_name} #{order_type}") + + status_type = params[:status_type] || "1" @close_issues_size = version_issues.where(status_id: 5).size + @open_issues_size = version_issues.size - @close_issues_size + + if status_type.to_s == "1" #表示开启中的 + version_issues = version_issues.where.not(status_id: 5) + else + version_issues = version_issues.where(status_id: 5) + end @page = params[:page] || 1 @limit = params[:limit] || 15 diff --git a/app/views/versions/show.json.jbuilder b/app/views/versions/show.json.jbuilder index 206b1faaf..b8e63e6cc 100644 --- a/app/views/versions/show.json.jbuilder +++ b/app/views/versions/show.json.jbuilder @@ -1,5 +1,6 @@ json.partial! "commons/success" json.issues_count @version_issues_size +json.open_issues_count @open_issues_size json.close_issues_count @close_issues_size json.user_name @version.version_user.try(:show_real_name) json.user_login @version.version_user.try(:login) From 77293e0fa0848cd12f9040929d150f37d57444de Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 26 Feb 2020 18:09:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8C=E7=A8=8B?= =?UTF-8?q?=E7=A2=91=E7=9A=84=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/versions/show.json.jbuilder | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/versions/show.json.jbuilder b/app/views/versions/show.json.jbuilder index b8e63e6cc..51640bbbd 100644 --- a/app/views/versions/show.json.jbuilder +++ b/app/views/versions/show.json.jbuilder @@ -2,6 +2,7 @@ json.partial! "commons/success" json.issues_count @version_issues_size json.open_issues_count @open_issues_size json.close_issues_count @close_issues_size +json.limit @limit json.user_name @version.version_user.try(:show_real_name) json.user_login @version.version_user.try(:login) json.created_at format_time(@version.created_on)