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

Merge pull request #1 from danmunn/devel-1.4.7

Browse Source 
Devel 1.4.7
This commit is contained in:
Atmis 2014-01-09 02:08:00 -08:00
commit 37696feb03
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/dmsf_helper.rb
View File

@ -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)

2
app/models/dmsf_workflow.rb
View File

@ -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

2
app/views/dmsf/_multi_upload.html.erb
View File

@ -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.*/) %>
<script type="text/javascript">
function initPlUploader(uploader) {

16
app/views/dmsf_workflows/_log.html.erb
View File

@ -72,20 +72,20 @@
</tr>
<% sql = "SELECT c.action, c.note, c.created_at, c.author_id, a.user_id, s.step FROM dmsf_workflow_step_actions c RIGHT JOIN dmsf_workflow_step_assignments a ON a.id = c.dmsf_workflow_step_assignment_id RIGHT JOIN dmsf_workflow_steps s ON s.id = a.dmsf_workflow_step_id WHERE a.dmsf_file_revision_id = #{revision.id} ORDER BY s.step, c.action DESC, c.created_at" %>
<% result = DmsfWorkflowStep.connection.execute sql %>
<% result.each_with_index do |row, i| %>
<% result.each_with_index do |row, i| %>
<tr id="step-<%= i + 3 %> " class="<%= cycle 'odd', 'even' %>">
<td class="step"><%= row[5] %></td>
<td><%= link_to_user User.find_by_id(row[3].present? ? row[3] : row[4]) %></td>
<td><%= DmsfWorkflowStepAction.action_str(row[0]) %></td>
<td class="step"><%= row['step'] %></td>
<td><%= link_to_user User.find_by_id(row['author_id'].present? ? row['author_id'] : row['user_id']) %></td>
<td><%= DmsfWorkflowStepAction.action_str(row['action']) %></td>
<td>
<% if((row[5].to_i == @workflow.dmsf_workflow_steps.last.step) && (revision.workflow == DmsfWorkflow::STATE_APPROVED) && (row[0] != DmsfWorkflowStepAction::ACTION_DELEGATE)) %>
<% if((row['step'].to_i == @workflow.dmsf_workflow_steps.last.step) && (revision.workflow == DmsfWorkflow::STATE_APPROVED) && (row['action'] != DmsfWorkflowStepAction::ACTION_DELEGATE)) %>
<%= l(:title_approved) %>
<% else %>
<%= DmsfWorkflowStepAction.workflow_str(row[0]) %>
<%= DmsfWorkflowStepAction.workflow_str(row['action']) %>
<% end %>
</td>
<td class="note"><%= row[1] %></td>
<td><%= format_time(row[2]) if row[2].present? %></td>
<td class="note"><%= row['note'] %></td>
<td><%= format_time(row['created_at']) if row['created_at'].present? %></td>
</tr>
<% end %>
</tbody>