Merge pull request 'FIX remote pr' (#176) from jasder/forgeplus:dev_trustie_server into dev_trustie_server

app/controllers/compare_controller.rb

@@ -24,7 +24,7 @@ class CompareController < ApplicationController
         @exist_pullrequest = @project.pull_requests.where(is_original: false, head: @base, base: @head, status: 0).take
       end
       if @exist_pullrequest.present?
-        return -2, "在这些分支之间的合并请求已存在：<a href='/projects/#{@owner.login}/#{@project.identifier}/pulls/#{@exist_pullrequest.id}/Messagecount'>#{@exist_pullrequest.try(:title)}</a>"
+        return -2, "在这些分支之间的合并请求已存在：<a href='/#{@owner.login}/#{@project.identifier}/pulls/#{@exist_pullrequest.id}/Messagecount'>#{@exist_pullrequest.try(:title)}</a>"
       else 
         if @compare_result["Commits"].blank? && @compare_result["Diff"].blank?
           return -2, "分支内容相同，无需创建合并请求"

app/controllers/pull_requests_controller.rb

@@ -61,7 +61,6 @@ class PullRequestsController < ApplicationController
         @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"], @gitea_pull_request[:body]["id"])
         SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @pull_request&.id)
         SendTemplateMessageJob.perform_later('ProjectPullRequest', current_user.id, @pull_request&.id)
-        render_ok
       else
         render_error("create pull request error: #{@gitea_pull_request[:status]}")
         raise ActiveRecord::Rollback
@@ -201,7 +200,7 @@ class PullRequestsController < ApplicationController
       if can_merge.present?
         render json: {
           status: -2,
-          message: "在这些分支之间的合并请求已存在：<a href='/projects/#{@owner.login}/#{@project.identifier}/pulls/#{can_merge.first.id}/Messagecount''>#{can_merge.first.try(:title)}</a>",
+          message: "在这些分支之间的合并请求已存在：<a href='/#{@owner.login}/#{@project.identifier}/pulls/#{can_merge.first.id}''>#{can_merge.first.try(:title)}</a>",
         }
       else
         normal_status(0, "可以合并")

app/views/pull_requests/_detail.json.jbuilder

@@ -0,0 +1,24 @@
+pr = issue.pull_request
+json.pull_request_id pr.id
+json.pull_request_status pr.status
+json.pull_request_head pr.head 
+json.pull_request_base pr.base
+json.pull_request_staus pr.status == 1 ? "merged" : (pr.status == 2 ? "closed" : "open")
+json.is_original pr.is_original
+json.fork_project_id pr&.fork_project_id
+json.fork_project_identifier pr&.fork_project&.identifier
+json.fork_project_user pr&.fork_project&.owner.try(:login)
+
+
+json.id issue.id
+json.name issue.subject
+json.pr_time time_from_now(pr.status == 1 ? pr.updated_at : issue.updated_on)
+json.assign_user_name issue.get_assign_user.try(:show_real_name)
+json.assign_user_login issue.get_assign_user.try(:login)
+json.author_name issue.user.try(:show_real_name)
+json.author_login issue.user.try(:login)
+json.avatar_url url_to_avatar(issue.user)
+json.priority issue.priority.try(:name)
+json.version issue.version.try(:name)
+json.journals_count issue.get_journals_size
+json.issue_tags issue.get_issue_tags

app/views/pull_requests/create.json.jbuilder

@@ -0,0 +1,2 @@
+json.partial! "commons/success"
+json.partial! 'detail', pr: @pull_request, issue: @pull_request.issue