From 90015ef5144bf75b3e57ec4551c78b505a45ab55 Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Fri, 7 May 2021 10:14:11 +0200 Subject: [PATCH] #1207 Sub-projects are not present --- app/controllers/dmsf_controller.rb | 2 +- assets/stylesheets/redmine_dmsf.css | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb index ae02fd91..7b0b42cd 100644 --- a/app/controllers/dmsf_controller.rb +++ b/app/controllers/dmsf_controller.rb @@ -77,7 +77,7 @@ class DmsfController < ApplicationController @trash_enabled = @folder_manipulation_allowed && @file_manipulation_allowed @query.dmsf_folder_id = @folder ? @folder.id : nil @query.deleted = false - @query.sub_projects |= (Setting.plugin_redmine_dmsf['dmsf_projects_as_subfolders'] == '1') + @query.sub_projects |= Setting.plugin_redmine_dmsf['dmsf_projects_as_subfolders'].present? if (@folder && @folder.deleted?) || (params[:folder_title].present? && !@folder) render_404 return diff --git a/assets/stylesheets/redmine_dmsf.css b/assets/stylesheets/redmine_dmsf.css index 131f152f..3606cd3a 100644 --- a/assets/stylesheets/redmine_dmsf.css +++ b/assets/stylesheets/redmine_dmsf.css @@ -246,6 +246,10 @@ div[id*="revision_access_"] { text-align: left; } +.dmsf-row-control { + float: left; +} + /* DMSF file upload */ .dmsf-uploader { padding:10px;