From 7372911feaf372437ef2c7b7dd841129a29e2c02 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Fri, 16 Oct 2020 16:02:26 +0800 Subject: [PATCH] =?UTF-8?q?FIX=20=E9=87=8D=E6=9E=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/repositories_helper.rb | 8 +++++++- app/views/repositories/show.json.jbuilder | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index f41fbd362..a845b70c5 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -1,4 +1,10 @@ module RepositoriesHelper + def render_permission(user, project) + return "Admin" if user&.admin? + return "Owner" if user === project.owner + project.get_premission(user) + end + def render_decode64_content(str) return nil if str.blank? Base64.decode64(str).force_encoding("UTF-8") @@ -44,7 +50,7 @@ module RepositoriesHelper end if r_content.include?("?") new_r_content = r_content + "&raw=true" - else + else new_r_content = r_content + "?raw=true" end unless r_content.include?("http://") || r_content.include?("https://") || r_content.include?("mailto:") diff --git a/app/views/repositories/show.json.jbuilder b/app/views/repositories/show.json.jbuilder index 29c8a77cf..fca2ad5bd 100644 --- a/app/views/repositories/show.json.jbuilder +++ b/app/views/repositories/show.json.jbuilder @@ -12,7 +12,7 @@ json.versions_count @project.versions_count #里程碑数量 json.version_releases_count @project.releases_size(@user.try(:id), "all") json.version_releasesed_count @project.releases_size(@user.try(:id), "released") #已发行的版本 json.contributor_users_count @project.contributor_users -json.permission User.current&.admin? ? "Manager" : @project.get_premission(@user) +json.permission render_permission(@user, @project) json.mirror_url @project&.repository.mirror_url json.mirror @project&.repository.mirror_url.present? json.type @project.numerical_for_project_type