From 0f0fc691d0a5fa5a2c2c4c0f64736d4736f93bdd Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 26 Feb 2020 17:44:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=91?=
 =?UTF-8?q?=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