diff --git a/app/helpers/dmsf_helper.rb b/app/helpers/dmsf_helper.rb index dbd1b360..08f28bf0 100644 --- a/app/helpers/dmsf_helper.rb +++ b/app/helpers/dmsf_helper.rb @@ -60,8 +60,8 @@ module DmsfHelper end end - def plugin_asset_path(plugin, asset_type, source) - return "/plugin_assets/#{plugin}/#{asset_type}/#{source}" + def plugin_asset_path(plugin, asset_type, source) + return "#{Redmine::Utils.relative_url_root}/plugin_assets/#{plugin}/#{asset_type}/#{source}" end def self.to_time(obj) diff --git a/app/models/dmsf_workflow.rb b/app/models/dmsf_workflow.rb index 520f7171..7478ae68 100644 --- a/app/models/dmsf_workflow.rb +++ b/app/models/dmsf_workflow.rb @@ -104,6 +104,8 @@ class DmsfWorkflow < ActiveRecord::Base 'id NOT IN (SELECT a.user_id FROM dmsf_workflow_step_assignments a WHERE id = ?) AND id IN (SELECT m.user_id FROM members m JOIN dmsf_files f ON f.project_id = m.project_id JOIN dmsf_file_revisions r ON r.dmsf_file_id = f.id WHERE r.id = ?)', dmsf_workflow_step_assignment_id, dmsf_file_revision_id] + elsif project + sql = ['id IN (SELECT user_id FROM members WHERE project_id = ?)', project.id] else sql = '1=1' end diff --git a/app/views/dmsf/_multi_upload.html.erb b/app/views/dmsf/_multi_upload.html.erb index f0dae54c..72569cb2 100644 --- a/app/views/dmsf/_multi_upload.html.erb +++ b/app/views/dmsf/_multi_upload.html.erb @@ -96,7 +96,7 @@ <%= javascript_include_tag 'plupload/plupload.html5.js', :plugin => 'redmine_dmsf' %> <%= javascript_include_tag 'plupload/plupload.html4.js', :plugin => 'redmine_dmsf' %> <%= javascript_include_tag 'plupload/jquery.ui.plupload/jquery.ui.plupload.js', :plugin => 'redmine_dmsf' %> - <%= javascript_include_tag('plupload/i18n/#{I18n.locale.to_s.downcase}.js', :plugin => 'redmine_dmsf') if I18n.locale && !I18n.locale.to_s.match(/^en.*/) %> + <%= javascript_include_tag("plupload/i18n/#{I18n.locale.to_s.downcase}.js", :plugin => 'redmine_dmsf') if I18n.locale && !I18n.locale.to_s.match(/^en.*/) %>