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

Tagging filter in sub-folders and tree view

Browse Source
This commit is contained in:
Karel Picman 2016-04-25 14:29:23 +02:00
parent d819670f0c
commit acb158e0e0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/dmsf_controller.rb
View File

@ -40,13 +40,14 @@ class DmsfController < ApplicationController
@force_file_unlock_allowed = User.current.allowed_to?(:force_file_unlock, @project) @force_file_unlock_allowed = User.current.allowed_to?(:force_file_unlock, @project)
@workflows_available = DmsfWorkflow.where(['project_id = ? OR project_id IS NULL', @project.id]).count > 0 @workflows_available = DmsfWorkflow.where(['project_id = ? OR project_id IS NULL', @project.id]).count > 0
@file_approval_allowed = User.current.allowed_to?(:file_approval, @project) @file_approval_allowed = User.current.allowed_to?(:file_approval, @project)
@tree_view = (User.current.pref[:dmsf_tree_view] == '1') && (!%w(atom xml json).include?(params[:format])) tag = params[:custom_field_id].present? && params[:custom_value].present?
@tree_view = (User.current.pref[:dmsf_tree_view] == '1') && (!%w(atom xml json).include?(params[:format])) && !tag
@folder = nil if tag
if @tree_view if @tree_view
@locked_for_user = false @locked_for_user = false
else else
unless @folder unless @folder
if params[:custom_field_id].present? && params[:custom_value].present? if tag
@subfolders = [] @subfolders = []
DmsfFolder.where(:project_id => @project.id).visible.each do |f| DmsfFolder.where(:project_id => @project.id).visible.each do |f|
f.custom_field_values.each do |v| f.custom_field_values.each do |v|
@ -120,12 +121,10 @@ class DmsfController < ApplicationController
end end
@locked_for_user = false @locked_for_user = false
else else
if @folder.deleted? if @folder.deleted?
render_404 render_404
return return
end end
@subfolders = @folder.dmsf_folders.visible @subfolders = @folder.dmsf_folders.visible
@files = @folder.dmsf_files.visible @files = @folder.dmsf_files.visible
@dir_links = @folder.folder_links.visible @dir_links = @folder.folder_links.visible