floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Change

This commit is contained in:
sylor_huang@126.com 2020-08-12 10:58:16 +08:00
parent 54b1af8d06
commit d80600a58c
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -750,7 +750,7 @@ class ApplicationController < ActionController::Base
@project @project
elsif current_user.is_a?(AnonymousUser) elsif current_user.is_a?(AnonymousUser)
logger.info "###########：This is AnonymousUser" logger.info "###########：This is AnonymousUser"
@project = nil if !@project.is_public @project = nil if @project && !@project.is_public?
render_forbidden and return render_forbidden and return
else else
logger.info "###########：project not found" logger.info "###########：project not found"

2
app/controllers/projects_controller.rb
View File

@ -116,7 +116,7 @@ class ProjectsController < ApplicationController
end end
def project_public? def project_public?
return if @project.is_public return if @project.is_public?
if current_user if current_user
return if current_user.admin? || @project.member?(current_user.id) return if current_user.admin? || @project.member?(current_user.id)

2
app/models/project.rb
View File

@ -122,7 +122,7 @@ class Project < ApplicationRecord
def can_visited? def can_visited?
is_public || User.current.admin? || member?(User.current) is_public? || User.current.admin? || member?(User.current)
end end
def releases_size(current_user_id, type) def releases_size(current_user_id, type)

4
app/views/users/projects/shared/_project.json.jbuilder
View File

@ -5,8 +5,8 @@ json.members_count project.members.count
json.issues_count project.issues.count json.issues_count project.issues.count
json.changesets_count project.project_score&.changeset_num.to_i json.changesets_count project.project_score&.changeset_num.to_i
json.is_public project&.is_public json.is_public project.is_public?
json.can_visited project&.can_visited? json.can_visited project.can_visited?
json.owner do json.owner do
json.partial! 'users/shared/real_user', user: project.owner json.partial! 'users/shared/real_user', user: project.owner

2
app/views/users/subjects/shared/_subject.json.jbuilder
View File

@ -5,4 +5,4 @@ json.image_url url_to_avatar(subject)
json.owner_id subject.user.id json.owner_id subject.user.id
json.owner_name subject.user.full_name json.owner_name subject.user.full_name
json.visits_count subject.visits json.visits_count subject.visits
json.can_visited subject&.can_visited? json.can_visited subject.can_visited?