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

Merge branch 'dev_trustie' of http://git.trustie.net/jasder/forgeplus into dev_trustie

This commit is contained in:
sylor_huang@126.com 2020-09-23 17:40:59 +08:00
parent b9a3a86b38 40d1a288b8
commit 116356c284
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/application_controller.rb
View File

@ -10,7 +10,7 @@ class ApplicationController < ActionController::Base
include LoggerHelper include LoggerHelper
include LoginHelper include LoginHelper
include RegisterHelper include RegisterHelper
protect_from_forgery prepend: true, unless: -> { request.format.json? } protect_from_forgery prepend: true, unless: -> { request.format.json? }
before_action :check_sign before_action :check_sign
@ -749,7 +749,7 @@ class ApplicationController < ActionController::Base
if @project and current_user.can_read_project?(@project) if @project and current_user.can_read_project?(@project)
logger.info "###########： has project and can read project" logger.info "###########： has project and can read project"
@project @project
elsif current_user.is_a?(AnonymousUser) elsif @project && 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.is_public?
render_forbidden and return render_forbidden and return