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

* fixed Issue 15: Error with multi upload and locked file

Browse Source 
git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@25 5e329b0b-a2ee-ea63-e329-299493fc886d
This commit is contained in:
vit.jonas@gmail.com 2011-05-09 09:46:59 +00:00
parent 807a454df4
commit f610a5a433
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/dmsf_detail_controller.rb
View File

@ -173,7 +173,7 @@ class DmsfDetailController < ApplicationController
Rails.logger.info "#{Time.now} from #{request.remote_ip}/#{request.env["HTTP_X_FORWARDED_FOR"]}: #{User.current.login} uploaded for project #{@project.identifier}:" Rails.logger.info "#{Time.now} from #{request.remote_ip}/#{request.env["HTTP_X_FORWARDED_FOR"]}: #{User.current.login} uploaded for project #{@project.identifier}:"
files.each {|file| Rails.logger.info "\t#{file.dmsf_path_str}:"} files.each {|file| Rails.logger.info "\t#{file.dmsf_path_str}:"}
begin begin
DmsfMailer.deliver_files_updated(User.current, files) DmsfMailer.deliver_files_updated(User.current, files) unless files.empty?
rescue ActionView::MissingTemplate => e rescue ActionView::MissingTemplate => e
Rails.logger.error "Could not send email notifications: " + e Rails.logger.error "Could not send email notifications: " + e
end end

1
app/views/dmsf_detail/_upload_file_locked.html.erb
View File

@ -1,5 +1,6 @@
<div class="box dmsf_upload"> <div class="box dmsf_upload">
<%= hidden_field_tag("commited_files[#{i}][disk_filename]", upload.disk_filename) %> <%= hidden_field_tag("commited_files[#{i}][disk_filename]", upload.disk_filename) %>
<%= hidden_field_tag("commited_files[#{i}][name]", upload.name) %>
<fieldset class="tabular"> <fieldset class="tabular">
<legend><%= h(upload.name) %></legend> <legend><%= h(upload.name) %></legend>
<p class="warning">File locked!</p> <p class="warning">File locked!</p>

2
init.rb
View File

@ -22,7 +22,7 @@ Redmine::Plugin.register :redmine_dmsf do
name "DMSF" name "DMSF"
author "Vít Jonáš" author "Vít Jonáš"
description "Document Management System Features for Redmine" description "Document Management System Features for Redmine"
version "0.6.0" version "0.5.2"
url "https://code.google.com/p/redmine-dmsf/" url "https://code.google.com/p/redmine-dmsf/"
author_url "mailto:vit.jonas@kontron-czech.com" author_url "mailto:vit.jonas@kontron-czech.com"