jro_apps/redmine Commit - r15535:ef45304817e9

Adds file custom field format (#6719)....

Jean-Philippe Lang -

r15535:ef45304817e9

parent child

Context file:

r15535:ef45304817e9

Collapse all files

app/views/custom_fields/formats/_attachment.html.erb created 644 0 0

NO CONTENT: new file 100644

test/integration/lib/redmine/field_format/attachment_format_test.rb created 644 +156 0

@@ -0,0 +1,156
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2016 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.expand_path('../../../../../test_helper', __FILE__)
	19
	20	class AttachmentFieldFormatTest < Redmine::IntegrationTest
	21	fixtures :projects,
	22	:users, :email_addresses,
	23	:roles,
	24	:members,
	25	:member_roles,
	26	:trackers,
	27	:projects_trackers,
	28	:enabled_modules,
	29	:issue_statuses,
	30	:issues,
	31	:enumerations,
	32	:custom_fields,
	33	:custom_values,
	34	:custom_fields_trackers,
	35	:attachments
	36
	37	def setup
	38	set_tmp_attachments_directory
	39	@field = IssueCustomField.generate!(:name => "File", :field_format => "attachment")
	40	log_user "jsmith", "jsmith"
	41	end
	42
	43	def test_new_should_include_inputs
	44	get '/projects/ecookbook/issues/new'
	45	assert_response :success
	46
	47	assert_select '[name^=?]', "issue[custom_field_values][#{@field.id}]", 2
	48	assert_select 'input[name=?][type=hidden][value=""]', "issue[custom_field_values][#{@field.id}][blank]"
	49	end
	50
	51	def test_create_with_attachment
	52	issue = new_record(Issue) do
	53	assert_difference 'Attachment.count' do
	54	post '/projects/ecookbook/issues', {
	55	:issue => {
	56	:subject => "Subject",
	57	:custom_field_values => {
	58	@field.id => {
	59	'blank' => '',
	60	'1' => {:file => uploaded_test_file("testfile.txt", "text/plain")}
	61	}
	62	}
	63	}
	64	}
	65	assert_response 302
	66	end
	67	end
	68
	69	custom_value = issue.custom_value_for(@field)
	70	assert custom_value
	71	assert custom_value.value.present?
	72
	73	attachment = Attachment.find_by_id(custom_value.value)
	74	assert attachment
	75	assert_equal custom_value, attachment.container
	76
	77	follow_redirect!
	78	assert_response :success
	79
	80	# link to the attachment
	81	link = css_select(".cf_#{@field.id} .value a")
	82	assert_equal 1, link.size
	83	assert_equal "testfile.txt", link.text
	84
	85	# download the attachment
	86	get link.attr('href')
	87	assert_response :success
	88	assert_equal "text/plain", response.content_type
	89	end
	90
	91	def test_create_without_attachment
	92	issue = new_record(Issue) do
	93	assert_no_difference 'Attachment.count' do
	94	post '/projects/ecookbook/issues', {
	95	:issue => {
	96	:subject => "Subject",
	97	:custom_field_values => {
	98	@field.id => {:blank => ''}
	99	}
	100	}
	101	}
	102	assert_response 302
	103	end
	104	end
	105
	106	custom_value = issue.custom_value_for(@field)
	107	assert custom_value
	108	assert custom_value.value.blank?
	109
	110	follow_redirect!
	111	assert_response :success
	112
	113	# no links to the attachment
	114	assert_select ".cf_#{@field.id} .value a", 0
	115	end
	116
	117	def test_failure_on_create_should_preserve_attachment
	118	attachment = new_record(Attachment) do
	119	assert_no_difference 'Issue.count' do
	120	post '/projects/ecookbook/issues', {
	121	:issue => {
	122	:subject => "",
	123	:custom_field_values => {
	124	@field.id => {:file => uploaded_test_file("testfile.txt", "text/plain")}
	125	}
	126	}
	127	}
	128	assert_response :success
	129	assert_select_error /Subject cannot be blank/
	130	end
	131	end
	132
	133	assert_nil attachment.container_id
	134	assert_select 'input[name=?][value=?][type=hidden]', "issue[custom_field_values][#{@field.id}][p0][token]", attachment.token
	135	assert_select 'input[name=?][value=?]', "issue[custom_field_values][#{@field.id}][p0][filename]", 'testfile.txt'
	136
	137	issue = new_record(Issue) do
	138	assert_no_difference 'Attachment.count' do
	139	post '/projects/ecookbook/issues', {
	140	:issue => {
	141	:subject => "Subject",
	142	:custom_field_values => {
	143	@field.id => {:token => attachment.token}
	144	}
	145	}
	146	}
	147	assert_response 302
	148	end
	149	end
	150
	151	custom_value = issue.custom_value_for(@field)
	152	assert custom_value
	153	assert_equal attachment.id.to_s, custom_value.value
	154	assert_equal custom_value, attachment.reload.container
	155	end
	156	end

test/unit/lib/redmine/field_format/attachment_format_test.rb created 644 +163 0

@@ -0,0 +1,163
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2016 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.expand_path('../../../../../test_helper', __FILE__)
	19	require 'redmine/field_format'
	20
	21	class Redmine::AttachmentFieldFormatTest < ActionView::TestCase
	22	include ApplicationHelper
	23	include Redmine::I18n
	24
	25	fixtures :users
	26
	27	def setup
	28	set_language_if_valid 'en'
	29	set_tmp_attachments_directory
	30	end
	31
	32	def test_should_accept_a_hash_with_upload_on_create
	33	field = GroupCustomField.generate!(:name => "File", :field_format => 'attachment')
	34	group = Group.new(:name => 'Group')
	35	attachment = nil
	36
	37	custom_value = new_record(CustomValue) do
	38	attachment = new_record(Attachment) do
	39	group.custom_field_values = {field.id => {:file => mock_file}}
	40	assert group.save
	41	end
	42	end
	43
	44	assert_equal 'a_file.png', attachment.filename
	45	assert_equal custom_value, attachment.container
	46	assert_equal field, attachment.container.custom_field
	47	assert_equal group, attachment.container.customized
	48	end
	49
	50	def test_should_accept_a_hash_with_no_upload_on_create
	51	field = GroupCustomField.generate!(:name => "File", :field_format => 'attachment')
	52	group = Group.new(:name => 'Group')
	53	attachment = nil
	54
	55	custom_value = new_record(CustomValue) do
	56	assert_no_difference 'Attachment.count' do
	57	group.custom_field_values = {field.id => {}}
	58	assert group.save
	59	end
	60	end
	61
	62	assert_equal '', custom_value.value
	63	end
	64
	65	def test_should_not_validate_with_invalid_upload_on_create
	66	field = GroupCustomField.generate!(:name => "File", :field_format => 'attachment')
	67	group = Group.new(:name => 'Group')
	68
	69	with_settings :attachment_max_size => 0 do
	70	assert_no_difference 'CustomValue.count' do
	71	assert_no_difference 'Attachment.count' do
	72	group.custom_field_values = {field.id => {:file => mock_file}}
	73	assert_equal false, group.save
	74	end
	75	end
	76	end
	77	end
	78
	79	def test_should_accept_a_hash_with_token_on_create
	80	field = GroupCustomField.generate!(:name => "File", :field_format => 'attachment')
	81	group = Group.new(:name => 'Group')
	82
	83	attachment = Attachment.create!(:file => mock_file, :author => User.find(2))
	84	assert_nil attachment.container
	85
	86	custom_value = new_record(CustomValue) do
	87	assert_no_difference 'Attachment.count' do
	88	group.custom_field_values = {field.id => {:token => attachment.token}}
	89	assert group.save
	90	end
	91	end
	92
	93	attachment.reload
	94	assert_equal custom_value, attachment.container
	95	assert_equal field, attachment.container.custom_field
	96	assert_equal group, attachment.container.customized
	97	end
	98
	99	def test_should_not_validate_with_invalid_token_on_create
	100	field = GroupCustomField.generate!(:name => "File", :field_format => 'attachment')
	101	group = Group.new(:name => 'Group')
	102
	103	assert_no_difference 'CustomValue.count' do
	104	assert_no_difference 'Attachment.count' do
	105	group.custom_field_values = {field.id => {:token => "123.0123456789abcdef"}}
	106	assert_equal false, group.save
	107	end
	108	end
	109	end
	110
	111	def test_should_replace_attachment_on_update
	112	field = GroupCustomField.generate!(:name => "File", :field_format => 'attachment')
	113	group = Group.new(:name => 'Group')
	114	attachment = nil
	115	custom_value = new_record(CustomValue) do
	116	attachment = new_record(Attachment) do
	117	group.custom_field_values = {field.id => {:file => mock_file}}
	118	assert group.save
	119	end
	120	end
	121	group.reload
	122
	123	assert_no_difference 'Attachment.count' do
	124	assert_no_difference 'CustomValue.count' do
	125	group.custom_field_values = {field.id => {:file => mock_file}}
	126	assert group.save
	127	end
	128	end
	129
	130	assert !Attachment.exists?(attachment.id)
	131	assert CustomValue.exists?(custom_value.id)
	132
	133	new_attachment = Attachment.order(:id => :desc).first
	134	custom_value.reload
	135	assert_equal custom_value, new_attachment.container
	136	end
	137
	138	def test_should_delete_attachment_on_update
	139	field = GroupCustomField.generate!(:name => "File", :field_format => 'attachment')
	140	group = Group.new(:name => 'Group')
	141	attachment = nil
	142	custom_value = new_record(CustomValue) do
	143	attachment = new_record(Attachment) do
	144	group.custom_field_values = {field.id => {:file => mock_file}}
	145	assert group.save
	146	end
	147	end
	148	group.reload
	149
	150	assert_difference 'Attachment.count', -1 do
	151	assert_no_difference 'CustomValue.count' do
	152	group.custom_field_values = {field.id => {}}
	153	assert group.save
	154	end
	155	end
	156
	157	assert !Attachment.exists?(attachment.id)
	158	assert CustomValue.exists?(custom_value.id)
	159
	160	custom_value.reload
	161	assert_equal '', custom_value.value
	162	end
	163	end

app/helpers/application_helper.rb +2 0

                   l(:general_text_No)
                 when 'Issue'
                   object.visible? && html ? link_to_issue(object) : "##{object.id}"
+                when 'Attachment'
+                  html ? link_to_attachment(object, :download => true) : object.filename
                 when 'CustomValue', 'CustomFieldValue'
                   if object.custom_field
                     f = object.custom_field.format.formatted_custom_value(self, object, html)

app/helpers/issues_helper.rb +7 -2

               def show_detail(detail, no_html=false, options={})
                 multiple = false
                 show_diff = false
+                no_details = false
                 case detail.property
                 when 'attr'
                   custom_field = detail.custom_field
                   if custom_field
                     label = custom_field.name
-                    if custom_field.format.class.change_as_diff
+                    if custom_field.format.class.change_no_details
+                      no_details = true
+                    elsif custom_field.format.class.change_as_diff
                       show_diff = true
                     else
                       multiple = custom_field.multiple?
                   end
                 end
-                if show_diff
+                if no_details
+                  s = l(:text_journal_changed_no_detail, :label => label).html_safe
+                elsif show_diff
                   s = l(:text_journal_changed_no_detail, :label => label)
                   unless no_html
                     diff_link = link_to 'diff',

app/models/custom_field.rb +23 -12

                 end
               end
+              def set_custom_field_value(custom_field_value, value)
+                format.set_custom_field_value(self, custom_field_value, value)
+              end
               def cast_value(value)
                 format.cast_value(self, value)
               end
               # or an empty array if value is a valid value for the custom field
               def validate_custom_value(custom_value)
                 value = custom_value.value
-                errs = []
+                errs = format.validate_custom_value(custom_value)
-                if value.is_a?(Array)
-                  if !multiple?
+                unless errs.any?
-                    errs << ::I18n.t('activerecord.errors.messages.invalid')
+                  if value.is_a?(Array)
-                  end
+                    if !multiple?
-                  if is_required? && value.detect(&:present?).nil?
+                      errs << ::I18n.t('activerecord.errors.messages.invalid')
-                    errs << ::I18n.t('activerecord.errors.messages.blank')
+                    end
-                  end
+                    if is_required? && value.detect(&:present?).nil?
-                else
+                      errs << ::I18n.t('activerecord.errors.messages.blank')
-                  if is_required? && value.blank?
+                    end
-                    errs << ::I18n.t('activerecord.errors.messages.blank')
+                  else
+                    if is_required? && value.blank?
+                      errs << ::I18n.t('activerecord.errors.messages.blank')
+                    end
                   end
                 end
-                errs += format.validate_custom_value(custom_value)
                 errs
               end
                 validate_field_value(value).empty?
               end
+              def after_save_custom_value(custom_value)
+                format.after_save_custom_value(self, custom_value)
+              end
               def format_in?(*args)
                 args.include?(field_format)
               end

app/models/custom_field_value.rb +4 0

                 value.to_s
               end
+              def value=(v)
+                @value = custom_field.set_custom_field_value(self, v)
+              end
               def validate_value
                 custom_field.validate_custom_value(self).each do |message|
                   customized.errors.add(:base, custom_field.name + ' ' + message)

app/models/custom_value.rb +12 0

               belongs_to :customized, :polymorphic => true
               attr_protected :id
+              after_save :custom_field_after_save_custom_value
               def initialize(attributes=nil, *args)
                 super
                 if new_record? && custom_field && !attributes.key?(:value)
                 custom_field.visible?
               end
+              def attachments_visible?(user)
+                visible? && customized && customized.visible?(user)
+              end
               def required?
                 custom_field.is_required?
               end
               def to_s
                 value.to_s
               end
+              private
+              def custom_field_after_save_custom_value
+                custom_field.after_save_custom_value(self)
+              end
             end

app/views/attachments/_form.html.erb +41 -25

@@ -1,29 +1,45
1	<span id="attachments_fields">	1	<% attachment_param \|\|= 'attachments' %>
2	<% if defined?(container) && container && container.saved_attachments %>	2	<% saved_attachments \|\|= container.saved_attachments if defined?(container) && container %>
3	<% container.saved_attachments.each_with_index do \|attachment, i\| %>	3	<% multiple = true unless defined?(multiple) && multiple == false %>
4	<span id="attachments_p<%= i %>">	4	<% show_add = multiple \|\| saved_attachments.blank? %>
5	<%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename') +	5	<% description = (defined?(description) && description == false ? false : true) %>
6	text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description') +	6	<% css_class = (defined?(filedrop) && filedrop == false ? '' : 'filedrop') %>
7	link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>	7
8	<%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>	8	<span class="attachments_form">
9	</span>	9	<span class="attachments_fields">
		10	<% if saved_attachments.present? %>
		11	<% saved_attachments.each_with_index do \|attachment, i\| %>
		12	<span id="attachments_p<%= i %>">
		13	<%= text_field_tag("#{attachment_param}[p#{i}][filename]", attachment.filename, :class => 'filename') %>
		14	<% if attachment.container_id.present? %>
		15	<%= link_to l(:label_delete), "#", :onclick => "$(this).closest('.attachments_form').find('.add_attachment').show(); $(this).parent().remove(); return false;", :class => 'icon-only icon-del' %>
		16	<%= hidden_field_tag "#{attachment_param}[p#{i}][id]", attachment.id %>
		17	<% else %>
		18	<%= text_field_tag("#{attachment_param}[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description') if description %>
		19	<%= link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
		20	<%= hidden_field_tag "#{attachment_param}[p#{i}][token]", attachment.token %>
		21	<% end %>
		22	</span>
		23	<% end %>
10	<% end %>	24	<% end %>
11	<% end %>	25	</span>
12	</span>	26	<span class="add_attachment" style="<%= show_add ? nil : 'display:none;' %>">
13	<span class="add_attachment">	27	<%= file_field_tag "#{attachment_param}[dummy][file]",
14	<%= file_field_tag 'attachments[dummy][file]',	28	:id => nil,
15	:id => nil,	29	:class => "file_selector #{css_class}",
16	:class => 'file_selector',	30	:multiple => multiple,
17	:multiple => true,	31	:onchange => 'addInputFiles(this);',
18	:onchange => 'addInputFiles(this);',	32	:data => {
19	:data => {	33	:max_file_size => Setting.attachment_max_size.to_i.kilobytes,
20	:max_file_size => Setting.attachment_max_size.to_i.kilobytes,	34	:max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
21	:max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),	35	:max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
22	:max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,	36	:upload_path => uploads_path(:format => 'js'),
23	:upload_path => uploads_path(:format => 'js'),	37	:param => attachment_param,
24	:description~~_placeholder~~ => ~~l(:label_optional_~~description)	38	:description => description,
25	} %>	39	:description_placeholder => l(:label_optional_description)
26	(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)	40	} %>
		41	(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
		42	</span>
27	</span>	43	</span>
28		44
29	<% content_for :header_tags do %>	45	<% content_for :header_tags do %>

app/views/attachments/destroy.js.erb +1 0

@@ -1,1 +1,2
		1	$('#attachments_<%= j params[:attachment_id] %>').closest('.attachments_form').find('.add_attachment').show();
1	$('#attachments_<%= j params[:attachment_id] %>').remove();	2	$('#attachments_<%= j params[:attachment_id] %>').remove();

app/views/attachments/upload.js.erb +1 -1

               fileSpan.hide();
               alert("<%= escape_javascript @attachment.errors.full_messages.join(', ') %>");
             <% else %>
-            $('<input>', { type: 'hidden', name: 'attachments[<%= j params[:attachment_id] %>][token]' } ).val('<%= j @attachment.token %>').appendTo(fileSpan);
+            fileSpan.find('input.token').val('<%= j @attachment.token %>');
             fileSpan.find('a.remove-upload')
               .attr({
                 "data-remote": true,

app/views/custom_fields/_form.html.erb +12 0

             when "IssueCustomField" %>
                 <p><%= f.check_box :is_required %></p>
                 <p><%= f.check_box :is_for_all, :data => {:disables => '#custom_field_project_ids input'} %></p>
+                <% if @custom_field.format.is_filter_supported %>
                 <p><%= f.check_box :is_filter %></p>
+                <% end %>
                 <% if @custom_field.format.searchable_supported %>
                 <p><%= f.check_box :searchable %></p>
                 <% end %>
                 <p><%= f.check_box :is_required %></p>
                 <p><%= f.check_box :visible %></p>
                 <p><%= f.check_box :editable %></p>
+                <% if @custom_field.format.is_filter_supported %>
                 <p><%= f.check_box :is_filter %></p>
+                <% end %>
             <% when "ProjectCustomField" %>
                 <p><%= f.check_box :is_required %></p>
                 <% if @custom_field.format.searchable_supported %>
                 <p><%= f.check_box :searchable %></p>
                 <% end %>
+                <% if @custom_field.format.is_filter_supported %>
                 <p><%= f.check_box :is_filter %></p>
+                <% end %>
             <% when "VersionCustomField" %>
                 <p><%= f.check_box :is_required %></p>
+                <% if @custom_field.format.is_filter_supported %>
                 <p><%= f.check_box :is_filter %></p>
+                <% end %>
             <% when "GroupCustomField" %>
                 <p><%= f.check_box :is_required %></p>
+                <% if @custom_field.format.is_filter_supported %>
                 <p><%= f.check_box :is_filter %></p>
+                <% end %>
             <% when "TimeEntryCustomField" %>
                 <p><%= f.check_box :is_required %></p>
+                <% if @custom_field.format.is_filter_supported %>
                 <p><%= f.check_box :is_filter %></p>
+                <% end %>
             <% else %>
                 <p><%= f.check_box :is_required %></p>

lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb +10 -1

                                              options.merge(:as => :container, :dependent => :destroy, :inverse_of => :container)
                       send :include, Redmine::Acts::Attachable::InstanceMethods
                       before_save :attach_saved_attachments
+                      after_rollback :detach_saved_attachments
                       validate :warn_about_failed_attachments
                     end
                   end
                           if file = attachment['file']
                             next unless file.size > 0
                             a = Attachment.create(:file => file, :author => author)
-                          elsif token = attachment['token']
+                          elsif token = attachment['token'].presence
                             a = Attachment.find_by_token(token)
                             unless a
                               @failed_attachment_count += 1
                       end
                     end
+                    def detach_saved_attachments
+                      saved_attachments.each do |attachment|
+                        # TODO: use #reload instead, after upgrading to Rails 5
+                        # (after_rollback is called when running transactional tests in Rails 4)
+                        attachment.container = nil
+                      end
+                    end
                     def warn_about_failed_attachments
                       if @failed_attachment_count && @failed_attachment_count > 0
                         errors.add :base, ::I18n.t('warning_attachments_not_saved', count: @failed_attachment_count)

lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb +3 -12

                       custom_field_values.each do |custom_field_value|
                         key = custom_field_value.custom_field_id.to_s
                         if values.has_key?(key)
-                          value = values[key]
+                          custom_field_value.value = values[key]
-                          if value.is_a?(Array)
-                            value = value.reject(&:blank?).map(&:to_s).uniq
-                            if value.empty?
-                              value << ''
-                            end
-                          else
-                            value = value.to_s
-                          end
-                          custom_field_value.value = value
                         end
                       end
                       @custom_field_values_changed = true
                           if values.empty?
                             values << custom_values.build(:customized => self, :custom_field => field)
                           end
-                          x.value = values.map(&:value)
+                          x.instance_variable_set("@value", values.map(&:value))
                         else
                           cv = custom_values.detect { |v| v.custom_field == field }
                           cv ||= custom_values.build(:customized => self, :custom_field => field)
-                          x.value = cv.value
+                          x.instance_variable_set("@value", cv.value)
                         end
                         x.value_was = x.value.dup if x.value
                         x

lib/redmine/field_format.rb +129 0

@@ -67,6 +67,10 module Redmine
67	class_attribute :multiple_supported	67	class_attribute :multiple_supported
68	self.multiple_supported = false	68	self.multiple_supported = false
69		69
		70	# Set this to true if the format supports filtering on custom values
		71	class_attribute :is_filter_supported
		72	self.is_filter_supported = true
		73
70	# Set this to true if the format supports textual search on custom values	74	# Set this to true if the format supports textual search on custom values
71	class_attribute :searchable_supported	75	class_attribute :searchable_supported
72	self.searchable_supported = false	76	self.searchable_supported = false
@@ -87,6 +91,9 module Redmine
87	class_attribute :change_as_diff	91	class_attribute :change_as_diff
88	self.change_as_diff = false	92	self.change_as_diff = false
89		93
		94	class_attribute :change_no_details
		95	self.change_no_details = false
		96
90	def self.add(name)	97	def self.add(name)
91	self.format_name = name	98	self.format_name = name
92	Redmine::FieldFormat.add(name, self)	99	Redmine::FieldFormat.add(name, self)
@@ -107,6 +114,19 module Redmine
107	"label_#{name}"	114	"label_#{name}"
108	end	115	end
109		116
		117	def set_custom_field_value(custom_field, custom_field_value, value)
		118	if value.is_a?(Array)
		119	value = value.map(&:to_s).reject{\|v\| v==''}.uniq
		120	if value.empty?
		121	value << ''
		122	end
		123	else
		124	value = value.to_s
		125	end
		126
		127	value
		128	end
		129
110	def cast_custom_value(custom_value)	130	def cast_custom_value(custom_value)
111	cast_value(custom_value.custom_field, custom_value.value, custom_value.customized)	131	cast_value(custom_value.custom_field, custom_value.value, custom_value.customized)
112	end	132	end
@@ -169,6 +189,7 module Redmine
169		189
170	# Returns the validation error messages for custom_value	190	# Returns the validation error messages for custom_value
171	# Should return an empty array if custom_value is valid	191	# Should return an empty array if custom_value is valid
		192	# custom_value is a CustomFieldValue.
172	def validate_custom_value(custom_value)	193	def validate_custom_value(custom_value)
173	values = Array.wrap(custom_value.value).reject {\|value\| value.to_s == ''}	194	values = Array.wrap(custom_value.value).reject {\|value\| value.to_s == ''}
174	errors = values.map do \|value\|	195	errors = values.map do \|value\|
@@ -181,6 +202,10 module Redmine
181	[]	202	[]
182	end	203	end
183		204
		205	# CustomValue after_save callback
		206	def after_save_custom_value(custom_field, custom_value)
		207	end
		208
184	def formatted_custom_value(view, custom_value, html=false)	209	def formatted_custom_value(view, custom_value, html=false)
185	formatted_value(view, custom_value.custom_field, custom_value.value, custom_value.customized, html)	210	formatted_value(view, custom_value.custom_field, custom_value.value, custom_value.customized, html)
186	end	211	end
@@ -830,5 +855,109 module Redmine
830	scope.sort.collect{\|u\| [u.to_s, u.id.to_s] }	855	scope.sort.collect{\|u\| [u.to_s, u.id.to_s] }
831	end	856	end
832	end	857	end
		858
		859	class AttachementFormat < Base
		860	add 'attachment'
		861	self.form_partial = 'custom_fields/formats/attachment'
		862	self.is_filter_supported = false
		863	self.change_no_details = true
		864
		865	def set_custom_field_value(custom_field, custom_field_value, value)
		866	attachment_present = false
		867
		868	if value.is_a?(Hash)
		869	attachment_present = true
		870	value = value.except(:blank)
		871
		872	if value.values.any? && value.values.all? {\|v\| v.is_a?(Hash)}
		873	value = value.values.first
		874	end
		875
		876	if value.key?(:id)
		877	value = set_custom_field_value_by_id(custom_field, custom_field_value, value[:id])
		878	elsif value[:token].present?
		879	if attachment = Attachment.find_by_token(value[:token])
		880	value = attachment.id.to_s
		881	else
		882	value = ''
		883	end
		884	elsif value.key?(:file)
		885	attachment = Attachment.new(:file => value[:file], :author => User.current)
		886	if attachment.save
		887	value = attachment.id.to_s
		888	else
		889	value = ''
		890	end
		891	else
		892	attachment_present = false
		893	value = ''
		894	end
		895	elsif value.is_a?(String)
		896	value = set_custom_field_value_by_id(custom_field, custom_field_value, value)
		897	end
		898	custom_field_value.instance_variable_set "@attachment_present", attachment_present
		899
		900	value
		901	end
		902
		903	def set_custom_field_value_by_id(custom_field, custom_field_value, id)
		904	attachment = Attachment.find_by_id(id)
		905	if attachment && attachment.container.is_a?(CustomValue) && attachment.container.customized == custom_field_value.customized
		906	id.to_s
		907	else
		908	''
		909	end
		910	end
		911	private :set_custom_field_value_by_id
		912
		913	def cast_single_value(custom_field, value, customized=nil)
		914	Attachment.find_by_id(value.to_i) if value.present? && value.respond_to?(:to_i)
		915	end
		916
		917	def validate_custom_value(custom_value)
		918	errors = []
		919
		920	if custom_value.instance_variable_get("@attachment_present") && custom_value.value.blank?
		921	errors << ::I18n.t('activerecord.errors.messages.invalid')
		922	end
		923
		924	errors.uniq
		925	end
		926
		927	def after_save_custom_value(custom_field, custom_value)
		928	if custom_value.value_changed?
		929	if custom_value.value.present?
		930	attachment = Attachment.where(:id => custom_value.value.to_s).first
		931	if attachment
		932	attachment.container = custom_value
		933	attachment.save!
		934	end
		935	end
		936	if custom_value.value_was.present?
		937	attachment = Attachment.where(:id => custom_value.value_was.to_s).first
		938	if attachment
		939	attachment.destroy
		940	end
		941	end
		942	end
		943	end
		944
		945	def edit_tag(view, tag_id, tag_name, custom_value, options={})
		946	attachment = nil
		947	if custom_value.value.present? #&& custom_value.value == custom_value.value_was
		948	attachment = Attachment.find_by_id(custom_value.value)
		949	end
		950
		951	view.hidden_field_tag("#{tag_name}[blank]", "") +
		952	view.render(:partial => 'attachments/form',
		953	:locals => {
		954	:attachment_param => tag_name,
		955	:multiple => false,
		956	:description => false,
		957	:saved_attachments => [attachment].compact,
		958	:filedrop => false
		959	})
		960	end
		961	end
833	end	962	end
834	end	963	end

public/javascripts/attachments.js +28 -13

                Copyright (C) 2006-2016  Jean-Philippe Lang */
             function addFile(inputEl, file, eagerUpload) {
+              var attachmentsFields = $(inputEl).closest('.attachments_form').find('.attachments_fields');
+              var addAttachment = $(inputEl).closest('.attachments_form').find('.add_attachment');
+              var maxFiles = ($(inputEl).prop('multiple') == true ? 10 : 1);
-              if ($('#attachments_fields').children().length < 10) {
+              if (attachmentsFields.children().length < maxFiles) {
                 var attachmentId = addFile.nextAttachmentId++;
                 var fileSpan = $('<span>', { id: 'attachments_' + attachmentId });
+                var param = $(inputEl).data('param');
+                if (!param) {param = 'attachments'};
                 fileSpan.append(
-                    $('<input>', { type: 'text', 'class': 'filename readonly', name: 'attachments[' + attachmentId + '][filename]', readonly: 'readonly'} ).val(file.name),
+                    $('<input>', { type: 'text', 'class': 'filename readonly', name: param +'[' + attachmentId + '][filename]', readonly: 'readonly'} ).val(file.name),
-                    $('<input>', { type: 'text', 'class': 'description', name: 'attachments[' + attachmentId + '][description]', maxlength: 255, placeholder: $(inputEl).data('description-placeholder') } ).toggle(!eagerUpload),
+                    $('<input>', { type: 'text', 'class': 'description', name: param + '[' + attachmentId + '][description]', maxlength: 255, placeholder: $(inputEl).data('description-placeholder') } ).toggle(!eagerUpload),
+                    $('<input>', { type: 'hidden', 'class': 'token', name: param + '[' + attachmentId + '][token]'} ),
                     $('<a>&nbsp</a>').attr({ href: "#", 'class': 'remove-upload' }).click(removeFile).toggle(!eagerUpload)
-                ).appendTo('#attachments_fields');
+                ).appendTo(attachmentsFields);
+                if ($(inputEl).data('description') == 0) {
+                  fileSpan.find('input.description').remove();
+                }
                 if(eagerUpload) {
                   ajaxUpload(file, attachmentId, fileSpan, inputEl);
                 }
+                addAttachment.toggle(attachmentsFields.children().length < maxFiles);
                 return attachmentId;
               }
               return null;
             }
             function addInputFiles(inputEl) {
+              var attachmentsFields = $(inputEl).closest('.attachments_form').find('.attachments_fields');
+              var addAttachment = $(inputEl).closest('.attachments_form').find('.add_attachment');
               var clearedFileInput = $(inputEl).clone().val('');
+              var sizeExceeded = false;
+              var param = $(inputEl).data('param');
+              if (!param) {param = 'attachments'};
               if ($.ajaxSettings.xhr().upload && inputEl.files) {
                 // upload files using ajax
-                uploadAndAttachFiles(inputEl.files, inputEl);
+                sizeExceeded = uploadAndAttachFiles(inputEl.files, inputEl);
                 $(inputEl).remove();
               } else {
                 // browser not supporting the file API, upload on form submission
                 var aFilename = inputEl.value.split(/\/|\\/);
                 attachmentId = addFile(inputEl, { name: aFilename[ aFilename.length - 1 ] }, false);
                 if (attachmentId) {
-                  $(inputEl).attr({ name: 'attachments[' + attachmentId + '][file]', style: 'display:none;' }).appendTo('#attachments_' + attachmentId);
+                  $(inputEl).attr({ name: param + '[' + attachmentId + '][file]', style: 'display:none;' }).appendTo('#attachments_' + attachmentId);
                 }
               }
-              clearedFileInput.insertAfter('#attachments_fields');
+              clearedFileInput.prependTo(addAttachment);
             }
             function uploadAndAttachFiles(files, inputEl) {
               } else {
                 $.each(files, function() {addFile(inputEl, this, true);});
               }
+              return sizeExceeded;
             }
             function handleFileDropEvent(e) {
               blockEventPropagation(e);
               if ($.inArray('Files', e.dataTransfer.types) > -1) {
-                uploadAndAttachFiles(e.dataTransfer.files, $('input:file.file_selector'));
+                uploadAndAttachFiles(e.dataTransfer.files, $('input:file.filedrop').first());
               }
             }
                 $.event.fixHooks.drop = { props: [ 'dataTransfer' ] };
-                $('form div.box').has('input:file').each(function() {
+                $('form div.box:not(.filedroplistner)').has('input:file.filedrop').each(function() {
                   $(this).on({
                       dragover: dragOverHandler,
                       dragleave: dragOutHandler,
                       drop: handleFileDropEvent
-                  });
+                  }).addClass('filedroplistner');
                 });
               }
             }

public/stylesheets/application.css +15 -11

               margin: 0;
               padding: 3px 0 3px 0;
               padding-left: 180px; /* width of left column containing the label elements */
-              min-height: 1.8em;
+              line-height: 2em;
               clear:left;
             }
               width: 270px;
             }
+            label.block {
+              display: block;
+              width: auto !important;
+            }
             .tabular label.block{
               font-weight: normal;
               margin-left: 0px !important;
               text-align: left;
               float: none;
-              display: block;
-              width: auto !important;
             }
             .tabular label.inline{
             .check_box_group.bool_cf {border:0; background:inherit;}
             .check_box_group.bool_cf label {display: inline;}
-            #attachments_fields input.description, #existing-attachments input.description {margin-left:4px; width:340px;}
+            .attachments_fields input.description, #existing-attachments input.description {margin-left:4px; width:340px;}
-            #attachments_fields>span, #existing-attachments>span {display:block; white-space:nowrap;}
+            .attachments_fields>span, #existing-attachments>span {display:block; white-space:nowrap;}
-            #attachments_fields input.filename, #existing-attachments .filename {border:0; width:250px; color:#555; background-color:inherit; background:url(../images/attachment.png) no-repeat 1px 50%; padding-left:18px;}
+            .attachments_fields input.filename, #existing-attachments .filename {border:0; width:250px; color:#555; background-color:inherit; background:url(../images/attachment.png) no-repeat 1px 50%; padding-left:18px;}
-            #attachments_fields input.filename {height:1.8em;}
+            .tabular input.filename {max-width:75% !important;}
-            #attachments_fields .ajax-waiting input.filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
+            .attachments_fields input.filename {height:1.8em;}
-            #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
+            .attachments_fields .ajax-waiting input.filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
-            #attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
+            .attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
+            .attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
             a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block; padding-left:16px;}
             a.remove-upload:hover {text-decoration:none !important;}
             .existing-attachment.deleted .filename {text-decoration:line-through; color:#999 !important;}
               padding-top: 0;
               padding-bottom: 0;
               font-size: 8px;
-              vertical-align: text-bottom;
+              vertical-align: middle;
             }
             .icon-only::after {
               content: "&nbsp;";

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages