redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A simplier condition for the trash bin enabling

Browse Source
This commit is contained in:
Karel Pičman 2015-03-25 14:51:28 +01:00
parent eb53e2448e
commit 8ebe59fa3b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/dmsf_controller.rb
View File

@ -129,12 +129,11 @@ class DmsfController < ApplicationController
@ajax_upload_size = Setting.plugin_redmine_dmsf['dmsf_max_ajax_upload_filesize'].present? ? Setting.plugin_redmine_dmsf['dmsf_max_ajax_upload_filesize'] : 100
# Trash
@trash_visible = @folder_manipulation_allowed && @file_manipulation_allowed && @file_delete_allowed && !@locked_for_user && !@folder
@trash_visible = @folder_manipulation_allowed && @file_manipulation_allowed &&
@file_delete_allowed && !@locked_for_user && !@folder
@trash_enabled = DmsfFolder.deleted.where(:project_id => @project.id).any? ||
DmsfFile.deleted.where(:project_id => @project.id).any? ||
DmsfLink.deleted.where(:project_id => @project.id, :target_type => DmsfFolder.model_name).any? ||
DmsfLink.deleted.where(:project_id => @project.id, :target_type => DmsfFile.model_name).any? ||
DmsfLink.deleted.where(:project_id => @project.id, :target_type => 'DmsfUrl').any?
DmsfLink.deleted.where(:project_id => @project.id).any?
end
def trash