From 73bbec7c9dfbd9a858ad2c10d12c2da735a2cf1d Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Thu, 21 May 2020 17:01:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9tags=E5=92=8Cversion=5Freleas?=
 =?UTF-8?q?e=E7=9A=84=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/repositories/tags.json.jbuilder     | 14 ++---
 .../version_releases/index.json.jbuilder      | 51 ++++++++++---------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/app/views/repositories/tags.json.jbuilder b/app/views/repositories/tags.json.jbuilder
index 287983fd2..b2278f8b2 100644
--- a/app/views/repositories/tags.json.jbuilder
+++ b/app/views/repositories/tags.json.jbuilder
@@ -1,9 +1,11 @@
 json.array! @tags do |tag|
-  json.name tag['name']
-  json.id tag['id']
-  json.zipball_url tag['zipball_url']
-  json.tarball_url tag['tarball_url']
-  json.commit do
-    json.sha tag['commit']['sha']
+  if tag.present? 
+    json.name tag['name']
+    json.id tag['id']
+    json.zipball_url tag['zipball_url']
+    json.tarball_url tag['tarball_url']
+    json.commit do
+      json.sha tag['commit']['sha']
+    end
   end
 end
diff --git a/app/views/version_releases/index.json.jbuilder b/app/views/version_releases/index.json.jbuilder
index 4df262261..b90830899 100644
--- a/app/views/version_releases/index.json.jbuilder
+++ b/app/views/version_releases/index.json.jbuilder
@@ -3,25 +3,10 @@ json.user_permission @user_permission
 # json.releases @version_releases
 json.releases do
   json.array! @version_releases.to_a.each do |re|
-    user = User.select(:id, :gitea_uid, :login, :lastname,:firstname, :nickname).find_by_gitea_uid(re["author"]["id"])
-    version = @forge_releases.find_by(version_gid: re["id"])
-    if @user_permission && re["draft"]
-      json.version_id version.try(:id)
-      json.id re["id"]
-      json.tag_name re["tag_name"]
-      json.target_commitish re["target_commitish"]
-      json.name re["name"]
-      json.body re["body"]
-      json.url re["url"]
-      json.tarball_url re["tarball_url"]
-      json.zipball_url re["zipball_url"]
-      json.draft re["draft"] ? "草稿" : (re["prerelease"] ? "预发行" : "稳定")
-      json.created_at format_time(re["created_at"].to_s.to_time)
-      json.published_at format_time(re["published_at"].to_s.to_time)
-      json.user_name user.present? ? user.try(:show_real_name) : ""
-      json.image_url user.present? ? url_to_avatar(user) : ""
-    else
-      unless re["draft"]
+    if re.present? 
+      user = User.select(:id, :gitea_uid, :login, :lastname,:firstname, :nickname).find_by_gitea_uid(re["author"]["id"])
+      version = @forge_releases.find_by(version_gid: re["id"])
+      if @user_permission && re["draft"]
         json.version_id version.try(:id)
         json.id re["id"]
         json.tag_name re["tag_name"]
@@ -36,13 +21,31 @@ json.releases do
         json.published_at format_time(re["published_at"].to_s.to_time)
         json.user_name user.present? ? user.try(:show_real_name) : ""
         json.image_url user.present? ? url_to_avatar(user) : ""
+      else
+        unless re["draft"]
+          json.version_id version.try(:id)
+          json.id re["id"]
+          json.tag_name re["tag_name"]
+          json.target_commitish re["target_commitish"]
+          json.name re["name"]
+          json.body re["body"]
+          json.url re["url"]
+          json.tarball_url re["tarball_url"]
+          json.zipball_url re["zipball_url"]
+          json.draft re["draft"] ? "草稿" : (re["prerelease"] ? "预发行" : "稳定")
+          json.created_at format_time(re["created_at"].to_s.to_time)
+          json.published_at format_time(re["published_at"].to_s.to_time)
+          json.user_name user.present? ? user.try(:show_real_name) : ""
+          json.image_url user.present? ? url_to_avatar(user) : ""
+        end
+      end
+      
+      json.attachments do
+        json.array! version.try(:attachments) do |attachment|
+          json.partial! "attachments/attachment_simple", locals: {attachment: attachment}
+        end
       end
     end
     
-    json.attachments do
-      json.array! version.try(:attachments) do |attachment|
-        json.partial! "attachments/attachment_simple", locals: {attachment: attachment}
-      end
-    end
   end
 end