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

Merge branch 'devel-2.4.2' of github.com:danmunn/redmine_dmsf into devel-2.4.2

Browse Source
This commit is contained in:
Karel Pičman 2019-09-24 08:56:22 +02:00
commit 1d28539e2f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/dmsf_controller.rb
View File

@ -30,6 +30,9 @@ class DmsfController < ApplicationController
before_action :find_parent, :only => [:new, :create] before_action :find_parent, :only => [:new, :create]
before_action :tree_view, :only => [:delete, :show] before_action :tree_view, :only => [:delete, :show]
before_action :permissions before_action :permissions
# also try to lookup folder by title if this is API call
before_action :find_folder_by_title, :only => [:show], :if => :api_request?
accept_api_auth :show, :create, :save, :delete accept_api_auth :show, :create, :save, :delete
@ -52,8 +55,6 @@ class DmsfController < ApplicationController
end end
def show def show
# also try to lookup folder by title if this is API call
find_folder_by_title if [:xml, :json].include? request.format.to_sym
get_display_params get_display_params
if (@folder && @folder.deleted?) || (params[:folder_title].present? && !@folder) if (@folder && @folder.deleted?) || (params[:folder_title].present? && !@folder)
render_404 render_404