Merge branch 'forge' of http://bdgit.educoder.net/Hjqreturn/educoder into forge

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

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

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

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

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

app/views/versions/show.json.jbuilder

@@ -1,6 +1,8 @@
 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)