floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-17 18:25:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'pre_trustie_server' into trustie_server

Browse Source 
# Conflicts:
#	app/models/issue.rb
#	app/models/journal.rb
This commit is contained in:
xxq250
2023-10-24 20:46:02 +08:00
parent abbb033fc7 2e2f7b2bd5
commit 6a989f972a
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/attachments_controller.rb
View File

@@ -224,6 +224,9 @@ class AttachmentsController < ApplicationController
elsif @file.container.is_a?(Journal)
project = @file.container.issue.project
candown = project.is_public || (current_user.logged? && project.member?(current_user))
elsif @file.container.is_a?(Project)
project = @file.container
candown = project.is_public || (current_user.logged? && project.member?(current_user))
else
project = nil
end