Permalink
Browse files

Merge branch 'release/0.1.3'

  • Loading branch information...
2 parents 6a58eaf + 012b0ca commit 5ec95089becf6cf99ccddef745b5acd371cd2960 @martin-denizet committed Jan 13, 2012
Showing with 13 additions and 5 deletions.
  1. +5 −0 CHANGELOG
  2. +1 −1 README.rdoc
  3. +6 −3 app/views/attachments/_form.rhtml
  4. +1 −1 init.rb
View
@@ -1,3 +1,8 @@
+Version 0.1.3 - 2012/02/7
+--------------------------
+
+* Bugfix:Redmine 1.3.x Cannot attach multiple files (JS error).
+
Version 0.1.2 - 2012/01/13
--------------------------
View
@@ -2,7 +2,7 @@
This plugin allows attaching several screenshots from clipboard directly to a Redmine issue.
Requires RMagick (http://rmagick.rubyforge.org/) to show screenshot thumbnails when adding/editing an issue.
-Compatibility: Redmine 1.1.0
+Compatibility: Redmine 1.3.x
Credits:
Authors: Konstantin Zaitcev (kos@axmor.com), Sergei Vasilyev (vsv@axmor.com), Alexandr Poplavsky (poplavsky@axmor.com),
@@ -3,10 +3,13 @@
<%= javascript_include_tag 'attach_screenshot', :plugin => 'redmine_attach_screenshot' %>
<% end %>
<span id="attachments_fields">
-<%= file_field_tag 'attachments[1][file]', :size => 30, :id => nil, :title => l(:label_attachment_description) %><label class="inline"><span id="attachment_description_label_content"><%= l(:label_optional_description) %></span><%= text_field_tag 'attachments[1][description]', '', :size => 60, :id => nil %>
-</label>
+ <span>
+ <%= file_field_tag 'attachments[1][file]', :size => 30, :id => nil, :class => 'file',
+ :onchange => "checkFileSize(this, #{Setting.attachment_max_size.to_i.kilobytes}, '#{escape_javascript(l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)))}');" -%>
+ <label class="inline"><%= l(:label_optional_description) %><%= text_field_tag 'attachments[1][description]', '', :size => 60, :id => nil, :class => 'description' %></label>
+ <%= link_to_function(image_tag('delete.png'), 'removeFileField(this)', :title => (l(:button_delete))) %>
+ </span>
</span>
-<br />
<small><%= link_to l(:label_add_another_file), '#', :onclick => 'addFileField(); return false;' %>
(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
</small>
View
@@ -10,7 +10,7 @@
author 'Konstantin Zaitsev, Sergei Vasiliev, Alexandr Poplavsky, Jens Alfke, modified by Martin Denizet'
author_url 'https://github.com/martin-denizet'
description 'Attach screenshots from clipboard directly to a Redmine issue'
- version '0.1.2-mdfork'
+ version '0.1.3-mdfork'
Dispatcher.to_prepare do
ApplicationController.send(:include, AttachScreenshotPlugin::ApplicationControllerPatch)
AccountController.send(:include, AttachScreenshotPlugin::CleanupTmp)

0 comments on commit 5ec9508

Please sign in to comment.