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

#823 context menu bug fixing

Browse Source
This commit is contained in:
Karel Picman 2018-02-22 10:50:31 +01:00
parent 747e2fd938
commit c28903b02f
3 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/controllers/dmsf_controller.rb
View File

@ -138,29 +138,29 @@ class DmsfController < ApplicationController
end
end
if params[:email_entries].present?
email_entries(selected_folders, selected_files)
elsif params[:restore_entries].present?
restore_entries(selected_folders, selected_files, selected_dir_links, selected_file_links, selected_url_links)
redirect_to :back
elsif params[:delete_entries].present?
delete_entries(selected_folders, selected_files, selected_dir_links, selected_file_links, selected_url_links, false)
redirect_to :back
elsif params[:destroy_entries].present?
delete_entries(selected_folders, selected_files, selected_dir_links, selected_file_links, selected_url_links, true)
redirect_to :back
else
download_entries(selected_folders, selected_files)
redirect_to :back
begin
if params[:email_entries].present?
email_entries(selected_folders, selected_files)# and return
elsif params[:restore_entries].present?
restore_entries(selected_folders, selected_files, selected_dir_links, selected_file_links, selected_url_links)
redirect_to :back
elsif params[:delete_entries].present?
delete_entries(selected_folders, selected_files, selected_dir_links, selected_file_links, selected_url_links, false)
redirect_to :back
elsif params[:destroy_entries].present?
delete_entries(selected_folders, selected_files, selected_dir_links, selected_file_links, selected_url_links, true)
redirect_to :back
else
download_entries(selected_folders, selected_files)
end
rescue FileNotFound
render_404 #and return
rescue DmsfAccessError
render_403 # and return
rescue Exception => e
flash[:error] = e.message
Rails.logger.error e.message
end
rescue FileNotFound
render_404
rescue DmsfAccessError
render_403
rescue Exception => e
flash[:error] = e.message
Rails.logger.error e.message
redirect_to :back
end
def tag_changed

2
app/views/dmsf/_dmsf_rows.erb
View File

@ -108,7 +108,7 @@
:file => obj.target_file,
:link => obj,
:id => obj.id,
:name => 'file-link',
:name => 'url-link',
:title => obj.name,
:onclick => onclick,
:position => position}) %>

10
app/views/dmsf_context_menus/dmsf.html.erb
View File

@ -24,7 +24,7 @@
<li>
<%= context_menu_link l(:button_download), entries_operations_dmsf_path(:id => @project, :folder_id => @folder,
:ids => params[:ids], :download_entries => true), :method => :post, :class => 'icon-download',
:disabled => @disabled %>
:id => 'dmsf-cm-download', :disabled => @disabled %>
</li>
<li>
<%= context_menu_link l(:field_mail), entries_operations_dmsf_path(:id => @project, :folder_id => @folder,
@ -33,7 +33,7 @@
</li>
<li>
<%= context_menu_link l(:button_delete), entries_operations_dmsf_path(:id => @project, :folder_id => @folder,
:ids => params[:ids], :destroy_entries => true), :method => :post, :class => 'icon-del',
:ids => params[:ids], :delete_entries => true), :method => :post, :class => 'icon-del',
:disabled => @disabled %>
</li>
<% if @file %>
@ -49,3 +49,9 @@
</li>
<% end %>
</ul>
<%= late_javascript_tag do %>
$('#dmsf-cm-download').click(function (event) {
contextMenuHide();
});
<% end %>