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' into dev_devops

This commit is contained in:
Jasder 2020-10-09 11:40:34 +08:00
parent fbae5a36d0 63ae3fdea0
commit 9af3b5b757
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/projects_controller.rb
View File

@ -2,7 +2,7 @@ class ProjectsController < ApplicationController
include ApplicationHelper include ApplicationHelper
include OperateProjectAbilityAble include OperateProjectAbilityAble
include ProjectsHelper include ProjectsHelper
before_action :require_login, except: %i[index branches group_type_list simple show fork_users praise_users watch_users recommend] before_action :require_login, except: %i[index branches group_type_list simple show fork_users praise_users watch_users recommend about]
before_action :load_project, except: %i[index group_type_list migrate create recommend] before_action :load_project, except: %i[index group_type_list migrate create recommend]
before_action :authorizate_user_can_edit_project!, only: %i[update] before_action :authorizate_user_can_edit_project!, only: %i[update]
before_action :project_public?, only: %i[fork_users praise_users watch_users] before_action :project_public?, only: %i[fork_users praise_users watch_users]
@ -112,6 +112,7 @@ class ProjectsController < ApplicationController
@attachments = Array(@project_detail&.attachments) if request.get? @attachments = Array(@project_detail&.attachments) if request.get?
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
if request.post? if request.post?
require_login
authorizate_user_can_edit_project! authorizate_user_can_edit_project!
unless @project_detail.present? unless @project_detail.present?
@project_detail = ProjectDetail.new( @project_detail = ProjectDetail.new(