Browse Source

FIX 重构项目管理权限

tags/v1.0.0
Jasder 5 years ago
parent
commit
7372911fea
2 changed files with 8 additions and 2 deletions
  1. +7
    -1
      app/helpers/repositories_helper.rb
  2. +1
    -1
      app/views/repositories/show.json.jbuilder

+ 7
- 1
app/helpers/repositories_helper.rb View File

@@ -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:")


+ 1
- 1
app/views/repositories/show.json.jbuilder View File

@@ -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


Loading…
Cancel
Save