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

Merge pull request #2 from danmunn/devel-1.4.7

Browse Source 
Devel 1.4.7
This commit is contained in:
Atmis 2014-01-14 13:29:08 -08:00
commit f84420b6e3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/dmsf_controller.rb
View File

@ -351,14 +351,14 @@ class DmsfController < ApplicationController
if selected_folders && selected_folders.is_a?(Array)
selected_folders.each do |selected_folder_id|
check_project(folder = DmsfFolder.visible.find(selected_folder_id))
zip.add_folder(folder, @folder.dmsf_path_str) if folder
zip.add_folder(folder, (@folder.dmsf_path_str if @folder)) if folder
end
end
if selected_files && selected_files.is_a?(Array)
selected_files.each do |selected_file_id|
check_project(file = DmsfFile.visible.find(selected_file_id))
if file && file.last_revision && File.exists?(file.last_revision.disk_file)
zip.add_file(file, (@folder.dmsf_path_str if @folder))
zip.add_file(file, (@folder.dmsf_path_str if @folder)) if file
else
raise FileNotFound
end

2
app/views/dmsf_folders_copy/new.html.erb
View File

@ -21,7 +21,7 @@
<div class="contextual"></div>
<%= render(:partial => 'path', :locals => {:folder => @folder, :filename => nil}) %>
<%= render(:partial => '/dmsf/path', :locals => {:folder => @folder, :filename => nil}) %>
<% unless DmsfFolder.allowed_target_projects_on_copy.blank? %>
<%= form_tag({:action => 'copy_to', :id => @folder}, :id => 'copyForm') do |f| %>

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

@ -71,7 +71,7 @@
<td><%= format_time(revision.dmsf_workflow_started_at) if revision.dmsf_workflow_started_at %></td>
</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 = DmsfWorkflowStep.connection.exec_query sql %>
<% result.each_with_index do |row, i| %>
<tr id="step-<%= i + 3 %> " class="<%= cycle 'odd', 'even' %>">
<td class="step"><%= row['step'] %></td>