diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index c6773ef57..bca9de22b 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -826,6 +826,6 @@ class FilesController < ApplicationController end def upload_files_menu - p 1 + end end diff --git a/app/views/files/upload_files_menu.js.erb b/app/views/files/upload_files_menu.js.erb index 3e44f5644..e083fac85 100644 --- a/app/views/files/upload_files_menu.js.erb +++ b/app/views/files/upload_files_menu.js.erb @@ -1,5 +1,5 @@ <% if @project %> - $('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/upload_project_files_on_navbar',:locals => {:container => @project}) %>'); + $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_project_files',:locals => {:project => @project,:project_attachment_type => 1}) %>'); showModal('ajax-modal', '513px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before("");