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

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'forwardable'
             require 'cgi'
             module ApplicationHelper
               include Redmine::WikiFormatting::Macros::Definitions
               include Redmine::I18n
               include GravatarHelper::PublicMethods
               include Redmine::Pagination::Helper
               include Redmine::SudoMode::Helper
               include Redmine::Themes::Helper
               include Redmine::Hook::Helper
               include Redmine::Helpers::URL
               extend Forwardable
               def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
               # Return true if user is authorized for controller/action, otherwise false
               def authorize_for(controller, action)
                 User.current.allowed_to?({:controller => controller, :action => action}, @project)
               end
               # Display a link if user is authorized
               #
               # @param [String] name Anchor text (passed to link_to)
               # @param [Hash] options Hash params. This will checked by authorize_for to see if the user is authorized
               # @param [optional, Hash] html_options Options passed to link_to
               # @param [optional, Hash] parameters_for_method_reference Extra parameters for link_to
               def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                 link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
               end
               # Displays a link to user's account page if active
               def link_to_user(user, options={})
                 if user.is_a?(User)
                   name = h(user.name(options[:format]))
                   if user.active? || (User.current.admin? && user.logged?)
                     link_to name, user_path(user), :class => user.css_classes
                   else
                     name
                   end
                 else
                   h(user.to_s)
                 end
               end
               # Displays a link to +issue+ with its subject.
               # Examples:
               #
               #   link_to_issue(issue)                        # => Defect #6: This is the subject
               #   link_to_issue(issue, :truncate => 6)        # => Defect #6: This i...
               #   link_to_issue(issue, :subject => false)     # => Defect #6
               #   link_to_issue(issue, :project => true)      # => Foo - Defect #6
               #   link_to_issue(issue, :subject => false, :tracker => false)     # => #6
               #
               def link_to_issue(issue, options={})
                 title = nil
                 subject = nil
                 text = options[:tracker] == false ? "##{issue.id}" : "#{issue.tracker} ##{issue.id}"
                 if options[:subject] == false
                   title = issue.subject.truncate(60)
                 else
                   subject = issue.subject
                   if truncate_length = options[:truncate]
                     subject = subject.truncate(truncate_length)
                   end
                 end
                 only_path = options[:only_path].nil? ? true : options[:only_path]
                 s = link_to(text, issue_url(issue, :only_path => only_path),
                             :class => issue.css_classes, :title => title)
                 s << h(": #{subject}") if subject
                 s = h("#{issue.project} - ") + s if options[:project]
                 s
               end
               # Generates a link to an attachment.
               # Options:
               # * :text - Link text (default to attachment filename)
               # * :download - Force download (default: false)
               def link_to_attachment(attachment, options={})
                 text = options.delete(:text) || attachment.filename
                 route_method = options.delete(:download) ? :download_named_attachment_url : :named_attachment_url
                 html_options = options.slice!(:only_path)
                 options[:only_path] = true unless options.key?(:only_path)
                 url = send(route_method, attachment, attachment.filename, options)
                 link_to text, url, html_options
               end
               # Generates a link to a SCM revision
               # Options:
               # * :text - Link text (default to the formatted revision)
               def link_to_revision(revision, repository, options={})
                 if repository.is_a?(Project)
                   repository = repository.repository
                 end
                 text = options.delete(:text) || format_revision(revision)
                 rev = revision.respond_to?(:identifier) ? revision.identifier : revision
                 link_to(
                     h(text),
                     {:controller => 'repositories', :action => 'revision', :id => repository.project, :repository_id => repository.identifier_param, :rev => rev},
                     :title => l(:label_revision_id, format_revision(revision)),
                     :accesskey => options[:accesskey]
                   )
               end
               # Generates a link to a message
               def link_to_message(message, options={}, html_options = nil)
                 link_to(
                   message.subject.truncate(60),
                   board_message_url(message.board_id, message.parent_id || message.id, {
                     :r => (message.parent_id && message.id),
                     :anchor => (message.parent_id ? "message-#{message.id}" : nil),
                     :only_path => true
                   }.merge(options)),
                   html_options
                 )
               end
               # Generates a link to a project if active
               # Examples:
               #
               #   link_to_project(project)                          # => link to the specified project overview
               #   link_to_project(project, {:only_path => false}, :class => "project") # => 3rd arg adds html options
               #   link_to_project(project, {}, :class => "project") # => html options with default url (project overview)
               #
               def link_to_project(project, options={}, html_options = nil)
                 if project.archived?
                   h(project.name)
                 else
                   link_to project.name,
                     project_url(project, {:only_path => true}.merge(options)),
                     html_options
                 end
               end
               # Generates a link to a project settings if active
               def link_to_project_settings(project, options={}, html_options=nil)
                 if project.active?
                   link_to project.name, settings_project_path(project, options), html_options
                 elsif project.archived?
                   h(project.name)
                 else
                   link_to project.name, project_path(project, options), html_options
                 end
               end
               # Generates a link to a version
               def link_to_version(version, options = {})
                 return '' unless version && version.is_a?(Version)
                 options = {:title => format_date(version.effective_date)}.merge(options)
                 link_to_if version.visible?, format_version_name(version), version_path(version), options
               end
               # Helper that formats object for html or text rendering
               def format_object(object, html=true, &block)
                 if block_given?
                   object = yield object
                 end
                 case object.class.name
                 when 'Array'
                   object.map {|o| format_object(o, html)}.join(', ').html_safe
                 when 'Time'
                   format_time(object)
                 when 'Date'
                   format_date(object)
                 when 'Fixnum'
                   object.to_s
                 when 'Float'
                   sprintf "%.2f", object
                 when 'User'
                   html ? link_to_user(object) : object.to_s
                 when 'Project'
                   html ? link_to_project(object) : object.to_s
                 when 'Version'
                   html ? link_to_version(object) : object.to_s
                 when 'TrueClass'
                   l(:general_text_Yes)
                 when 'FalseClass'
                   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)
                     if f.nil? || f.is_a?(String)
                       f
                     else
                       format_object(f, html, &block)
                     end
                   else
                     object.value.to_s
                   end
                 else
                   html ? h(object) : object.to_s
                 end
               end
               def wiki_page_path(page, options={})
                 url_for({:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title}.merge(options))
               end
               def thumbnail_tag(attachment)
                 link_to image_tag(thumbnail_path(attachment)),
                   named_attachment_path(attachment, attachment.filename),
                   :title => attachment.filename
               end
               def toggle_link(name, id, options={})
                 onclick = "$('##{id}').toggle(); "
                 onclick << (options[:focus] ? "$('##{options[:focus]}').focus(); " : "this.blur(); ")
                 onclick << "return false;"
                 link_to(name, "#", :onclick => onclick)
               end
               # Used to format item titles on the activity view
               def format_activity_title(text)
                 text
               end
               def format_activity_day(date)
                 date == User.current.today ? l(:label_today).titleize : format_date(date)
               end
               def format_activity_description(text)
                 h(text.to_s.truncate(120).gsub(%r{[\r\n]*<(pre|code)>.*$}m, '...')
                    ).gsub(/[\r\n]+/, "<br />").html_safe
               end
               def format_version_name(version)
                 if version.project == @project
                   h(version)
                 else
                   h("#{version.project} - #{version}")
                 end
               end
               def due_date_distance_in_words(date)
                 if date
                   l((date < User.current.today ? :label_roadmap_overdue : :label_roadmap_due_in), distance_of_date_in_words(User.current.today, date))
                 end
               end
               # Renders a tree of projects as a nested set of unordered lists
               # The given collection may be a subset of the whole project tree
               # (eg. some intermediate nodes are private and can not be seen)
               def render_project_nested_lists(projects, &block)
                 s = ''
                 if projects.any?
                   ancestors = []
                   original_project = @project
                   projects.sort_by(&:lft).each do |project|
                     # set the project environment to please macros.
                     @project = project
                     if (ancestors.empty? || project.is_descendant_of?(ancestors.last))
                       s << "<ul class='projects #{ ancestors.empty? ? 'root' : nil}'>\n"
                     else
                       ancestors.pop
                       s << "</li>"
                       while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
                         ancestors.pop
                         s << "</ul></li>\n"
                       end
                     end
                     classes = (ancestors.empty? ? 'root' : 'child')
                     s << "<li class='#{classes}'><div class='#{classes}'>"
                     s << h(block_given? ? capture(project, &block) : project.name)
                     s << "</div>\n"
                     ancestors << project
                   end
                   s << ("</li></ul>\n" * ancestors.size)
                   @project = original_project
                 end
                 s.html_safe
               end
               def render_page_hierarchy(pages, node=nil, options={})
                 content = ''
                 if pages[node]
                   content << "<ul class=\"pages-hierarchy\">\n"
                   pages[node].each do |page|
                     content << "<li>"
                     content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title, :version => nil},
                                        :title => (options[:timestamp] && page.updated_on ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
                     content << "\n" + render_page_hierarchy(pages, page.id, options) if pages[page.id]
                     content << "</li>\n"
                   end
                   content << "</ul>\n"
                 end
                 content.html_safe
               end
               # Renders flash messages
               def render_flash_messages
                 s = ''
                 flash.each do |k,v|
                   s << content_tag('div', v.html_safe, :class => "flash #{k}", :id => "flash_#{k}")
                 end
                 s.html_safe
               end
               # Renders tabs and their content
               def render_tabs(tabs, selected=params[:tab])
                 if tabs.any?
                   unless tabs.detect {|tab| tab[:name] == selected}
                     selected = nil
                   end
                   selected ||= tabs.first[:name]
                   render :partial => 'common/tabs', :locals => {:tabs => tabs, :selected_tab => selected}
                 else
                   content_tag 'p', l(:label_no_data), :class => "nodata"
                 end
               end
               # Renders the project quick-jump box
               def render_project_jump_box
                 return unless User.current.logged?
                 projects = User.current.projects.active.select(:id, :name, :identifier, :lft, :rgt).to_a
                 if projects.any?
                   options =
                     ("<option value=''>#{ l(:label_jump_to_a_project) }</option>" +
                      '<option value="" disabled="disabled">---</option>').html_safe
                   options << project_tree_options_for_select(projects, :selected => @project) do |p|
                     { :value => project_path(:id => p, :jump => current_menu_item) }
                   end
                   content_tag( :span, nil, :class => 'jump-box-arrow') +
                   select_tag('project_quick_jump_box', options, :onchange => 'if (this.value != \'\') { window.location = this.value; }')
                 end
               end
               def project_tree_options_for_select(projects, options = {})
                 s = ''.html_safe
                 if blank_text = options[:include_blank]
                   if blank_text == true
                     blank_text = '&nbsp;'.html_safe
                   end
                   s << content_tag('option', blank_text, :value => '')
                 end
                 project_tree(projects) do |project, level|
                   name_prefix = (level > 0 ? '&nbsp;' * 2 * level + '&#187; ' : '').html_safe
                   tag_options = {:value => project.id}
                   if project == options[:selected] || (options[:selected].respond_to?(:include?) && options[:selected].include?(project))
                     tag_options[:selected] = 'selected'
                   else
                     tag_options[:selected] = nil
                   end
                   tag_options.merge!(yield(project)) if block_given?
                   s << content_tag('option', name_prefix + h(project), tag_options)
                 end
                 s.html_safe
               end
               # Yields the given block for each project with its level in the tree
               #
               # Wrapper for Project#project_tree
               def project_tree(projects, options={}, &block)
                 Project.project_tree(projects, options, &block)
               end
               def principals_check_box_tags(name, principals)
                 s = ''
                 principals.each do |principal|
                   s << "<label>#{ check_box_tag name, principal.id, false, :id => nil } #{h principal}</label>\n"
                 end
                 s.html_safe
               end
               # Returns a string for users/groups option tags
               def principals_options_for_select(collection, selected=nil)
                 s = ''
                 if collection.include?(User.current)
                   s << content_tag('option', "<< #{l(:label_me)} >>", :value => User.current.id)
                 end
                 groups = ''
                 collection.sort.each do |element|
                   selected_attribute = ' selected="selected"' if option_value_selected?(element, selected) || element.id.to_s == selected
                   (element.is_a?(Group) ? groups : s) << %(<option value="#{element.id}"#{selected_attribute}>#{h element.name}</option>)
                 end
                 unless groups.empty?
                   s << %(<optgroup label="#{h(l(:label_group_plural))}">#{groups}</optgroup>)
                 end
                 s.html_safe
               end
               def option_tag(name, text, value, selected=nil, options={})
                 content_tag 'option', value, options.merge(:value => value, :selected => (value == selected))
               end
               def truncate_single_line_raw(string, length)
                 string.to_s.truncate(length).gsub(%r{[\r\n]+}m, ' ')
               end
               # Truncates at line break after 250 characters or options[:length]
               def truncate_lines(string, options={})
                 length = options[:length] || 250
                 if string.to_s =~ /\A(.{#{length}}.*?)$/m
                   "#{$1}..."
                 else
                   string
                 end
               end
               def anchor(text)
                 text.to_s.gsub(' ', '_')
               end
               def html_hours(text)
                 text.gsub(%r{(\d+)\.(\d+)}, '<span class="hours hours-int">\1</span><span class="hours hours-dec">.\2</span>').html_safe
               end
               def authoring(created, author, options={})
                 l(options[:label] || :label_added_time_by, :author => link_to_user(author), :age => time_tag(created)).html_safe
               end
               def time_tag(time)
                 text = distance_of_time_in_words(Time.now, time)
                 if @project
                   link_to(text, project_activity_path(@project, :from => User.current.time_to_date(time)), :title => format_time(time))
                 else
                   content_tag('abbr', text, :title => format_time(time))
                 end
               end
               def syntax_highlight_lines(name, content)
                 lines = []
                 syntax_highlight(name, content).each_line { |line| lines << line }
                 lines
               end
               def syntax_highlight(name, content)
                 Redmine::SyntaxHighlighting.highlight_by_filename(content, name)
               end
               def to_path_param(path)
                 str = path.to_s.split(%r{[/\\]}).select{|p| !p.blank?}.join("/")
                 str.blank? ? nil : str
               end
               def reorder_links(name, url, method = :post)
                 # TODO: remove associated styles from application.css too
                 ActiveSupport::Deprecation.warn "Application#reorder_links will be removed in Redmine 4."
                 link_to(l(:label_sort_highest),
                         url.merge({"#{name}[move_to]" => 'highest'}), :method => method,
                         :title => l(:label_sort_highest), :class => 'icon-only icon-move-top') +
                 link_to(l(:label_sort_higher),
                         url.merge({"#{name}[move_to]" => 'higher'}), :method => method,
                         :title => l(:label_sort_higher), :class => 'icon-only icon-move-up') +
                 link_to(l(:label_sort_lower),
                         url.merge({"#{name}[move_to]" => 'lower'}), :method => method,
                         :title => l(:label_sort_lower), :class => 'icon-only icon-move-down') +
                 link_to(l(:label_sort_lowest),
                         url.merge({"#{name}[move_to]" => 'lowest'}), :method => method,
                         :title => l(:label_sort_lowest), :class => 'icon-only icon-move-bottom')
               end
               def reorder_handle(object, options={})
                 data = {
                   :reorder_url => options[:url] || url_for(object),
                   :reorder_param => options[:param] || object.class.name.underscore
                 }
                 content_tag('span', '',
                   :class => "sort-handle",
                   :data => data,
                   :title => l(:button_sort))
               end
               def breadcrumb(*args)
                 elements = args.flatten
                 elements.any? ? content_tag('p', (args.join(" \xc2\xbb ") + " \xc2\xbb ").html_safe, :class => 'breadcrumb') : nil
               end
               def other_formats_links(&block)
                 concat('<p class="other-formats">'.html_safe + l(:label_export_to))
                 yield Redmine::Views::OtherFormatsBuilder.new(self)
                 concat('</p>'.html_safe)
               end
               def page_header_title
                 if @project.nil? || @project.new_record?
                   h(Setting.app_title)
                 else
                   b = []
                   ancestors = (@project.root? ? [] : @project.ancestors.visible.to_a)
                   if ancestors.any?
                     root = ancestors.shift
                     b << link_to_project(root, {:jump => current_menu_item}, :class => 'root')
                     if ancestors.size > 2
                       b << "\xe2\x80\xa6"
                       ancestors = ancestors[-2, 2]
                     end
                     b += ancestors.collect {|p| link_to_project(p, {:jump => current_menu_item}, :class => 'ancestor') }
                   end
                   b << content_tag(:span, h(@project), class: 'current-project')
                   if b.size > 1
                     separator = content_tag(:span, ' &raquo; '.html_safe, class: 'separator')
                     path = safe_join(b[0..-2], separator) + separator
                     b = [content_tag(:span, path.html_safe, class: 'breadcrumbs'), b[-1]]
                   end
                   safe_join b
                 end
               end
               # Returns a h2 tag and sets the html title with the given arguments
               def title(*args)
                 strings = args.map do |arg|
                   if arg.is_a?(Array) && arg.size >= 2
                     link_to(*arg)
                   else
                     h(arg.to_s)
                   end
                 end
                 html_title args.reverse.map {|s| (s.is_a?(Array) ? s.first : s).to_s}
                 content_tag('h2', strings.join(' &#187; ').html_safe)
               end
               # Sets the html title
               # Returns the html title when called without arguments
               # Current project name and app_title and automatically appended
               # Exemples:
               #   html_title 'Foo', 'Bar'
               #   html_title # => 'Foo - Bar - My Project - Redmine'
               def html_title(*args)
                 if args.empty?
                   title = @html_title || []
                   title << @project.name if @project
                   title << Setting.app_title unless Setting.app_title == title.last
                   title.reject(&:blank?).join(' - ')
                 else
                   @html_title ||= []
                   @html_title += args
                 end
               end
               # Returns the theme, controller name, and action as css classes for the
               # HTML body.
               def body_css_classes
                 css = []
                 if theme = Redmine::Themes.theme(Setting.ui_theme)
                   css << 'theme-' + theme.name
                 end
                 css << 'project-' + @project.identifier if @project && @project.identifier.present?
                 css << 'controller-' + controller_name
                 css << 'action-' + action_name
                 if UserPreference::TEXTAREA_FONT_OPTIONS.include?(User.current.pref.textarea_font)
                   css << "textarea-#{User.current.pref.textarea_font}"
                 end
                 css.join(' ')
               end
               def accesskey(s)
                 @used_accesskeys ||= []
                 key = Redmine::AccessKeys.key_for(s)
                 return nil if @used_accesskeys.include?(key)
                 @used_accesskeys << key
                 key
               end
               # Formats text according to system settings.
               # 2 ways to call this method:
               # * with a String: textilizable(text, options)
               # * with an object and one of its attribute: textilizable(issue, :description, options)
               def textilizable(*args)
                 options = args.last.is_a?(Hash) ? args.pop : {}
                 case args.size
                 when 1
                   obj = options[:object]
                   text = args.shift
                 when 2
                   obj = args.shift
                   attr = args.shift
                   text = obj.send(attr).to_s
                 else
                   raise ArgumentError, 'invalid arguments to textilizable'
                 end
                 return '' if text.blank?
                 project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
                 @only_path = only_path = options.delete(:only_path) == false ? false : true
                 text = text.dup
                 macros = catch_macros(text)
                 text = Redmine::WikiFormatting.to_html(Setting.text_formatting, text, :object => obj, :attribute => attr)
                 @parsed_headings = []
                 @heading_anchors = {}
                 @current_section = 0 if options[:edit_section_links]
                 parse_sections(text, project, obj, attr, only_path, options)
                 text = parse_non_pre_blocks(text, obj, macros) do |text|
                   [:parse_inline_attachments, :parse_wiki_links, :parse_redmine_links].each do |method_name|
                     send method_name, text, project, obj, attr, only_path, options
                   end
                 end
                 parse_headings(text, project, obj, attr, only_path, options)
                 if @parsed_headings.any?
                   replace_toc(text, @parsed_headings)
                 end
                 text.html_safe
               end
               def parse_non_pre_blocks(text, obj, macros)
                 s = StringScanner.new(text)
                 tags = []
                 parsed = ''
                 while !s.eos?
                   s.scan(/(.*?)(<(\/)?(pre|code)(.*?)>|\z)/im)
                   text, full_tag, closing, tag = s[1], s[2], s[3], s[4]
                   if tags.empty?
                     yield text
                     inject_macros(text, obj, macros) if macros.any?
                   else
                     inject_macros(text, obj, macros, false) if macros.any?
                   end
                   parsed << text
                   if tag
                     if closing
                       if tags.last && tags.last.casecmp(tag) == 0
                         tags.pop
                       end
                     else
                       tags << tag.downcase
                     end
                     parsed << full_tag
                   end
                 end
                 # Close any non closing tags
                 while tag = tags.pop
                   parsed << "</#{tag}>"
                 end
                 parsed
               end
               def parse_inline_attachments(text, project, obj, attr, only_path, options)
                 return if options[:inline_attachments] == false
                 # when using an image link, try to use an attachment, if possible
                 attachments = options[:attachments] || []
                 attachments += obj.attachments if obj.respond_to?(:attachments)
                 if attachments.present?
                   text.gsub!(/src="([^\/"]+\.(bmp|gif|jpg|jpe|jpeg|png))"(\s+alt="([^"]*)")?/i) do |m|
                     filename, ext, alt, alttext = $1.downcase, $2, $3, $4
                     # search for the picture in attachments
                     if found = Attachment.latest_attach(attachments, CGI.unescape(filename))
                       image_url = download_named_attachment_url(found, found.filename, :only_path => only_path)
                       desc = found.description.to_s.gsub('"', '')
                       if !desc.blank? && alttext.blank?
                         alt = " title=\"#{desc}\" alt=\"#{desc}\""
                       end
                       "src=\"#{image_url}\"#{alt}"
                     else
                       m
                     end
                   end
                 end
               end
               # Wiki links
               #
               # Examples:
               #   [[mypage]]
               #   [[mypage|mytext]]
               # wiki links can refer other project wikis, using project name or identifier:
               #   [[project:]] -> wiki starting page
               #   [[project:|mytext]]
               #   [[project:mypage]]
               #   [[project:mypage|mytext]]
               def parse_wiki_links(text, project, obj, attr, only_path, options)
                 text.gsub!(/(!)?(\[\[([^\]\n\|]+)(\|([^\]\n\|]+))?\]\])/) do |m|
                   link_project = project
                   esc, all, page, title = $1, $2, $3, $5
                   if esc.nil?
                     if page =~ /^([^\:]+)\:(.*)$/
                       identifier, page = $1, $2
                       link_project = Project.find_by_identifier(identifier) || Project.find_by_name(identifier)
                       title ||= identifier if page.blank?
                     end
                     if link_project && link_project.wiki
                       # extract anchor
                       anchor = nil
                       if page =~ /^(.+?)\#(.+)$/
                         page, anchor = $1, $2
                       end
                       anchor = sanitize_anchor_name(anchor) if anchor.present?
                       # check if page exists
                       wiki_page = link_project.wiki.find_page(page)
                       url = if anchor.present? && wiki_page.present? && (obj.is_a?(WikiContent) || obj.is_a?(WikiContent::Version)) && obj.page == wiki_page
                         "##{anchor}"
                       else
                         case options[:wiki_links]
                         when :local; "#{page.present? ? Wiki.titleize(page) : ''}.html" + (anchor.present? ? "##{anchor}" : '')
                         when :anchor; "##{page.present? ? Wiki.titleize(page) : title}" + (anchor.present? ? "_#{anchor}" : '') # used for single-file wiki export
                         else
                           wiki_page_id = page.present? ? Wiki.titleize(page) : nil
                           parent = wiki_page.nil? && obj.is_a?(WikiContent) && obj.page && project == link_project ? obj.page.title : nil
                           url_for(:only_path => only_path, :controller => 'wiki', :action => 'show', :project_id => link_project,
                            :id => wiki_page_id, :version => nil, :anchor => anchor, :parent => parent)
                         end
                       end
                       link_to(title.present? ? title.html_safe : h(page), url, :class => ('wiki-page' + (wiki_page ? '' : ' new')))
                     else
                       # project or wiki doesn't exist
                       all
                     end
                   else
                     all
                   end
                 end
               end
               # Redmine links
               #
               # Examples:
               #   Issues:
               #     #52 -> Link to issue #52
               #   Changesets:
               #     r52 -> Link to revision 52
               #     commit:a85130f -> Link to scmid starting with a85130f
               #   Documents:
               #     document#17 -> Link to document with id 17
               #     document:Greetings -> Link to the document with title "Greetings"
               #     document:"Some document" -> Link to the document with title "Some document"
               #   Versions:
               #     version#3 -> Link to version with id 3
               #     version:1.0.0 -> Link to version named "1.0.0"
               #     version:"1.0 beta 2" -> Link to version named "1.0 beta 2"
               #   Attachments:
               #     attachment:file.zip -> Link to the attachment of the current object named file.zip
               #   Source files:
               #     source:some/file -> Link to the file located at /some/file in the project's repository
               #     source:some/file@52 -> Link to the file's revision 52
               #     source:some/file#L120 -> Link to line 120 of the file
               #     source:some/file@52#L120 -> Link to line 120 of the file's revision 52
               #     export:some/file -> Force the download of the file
               #   Forum messages:
               #     message#1218 -> Link to message with id 1218
               #  Projects:
               #     project:someproject -> Link to project named "someproject"
               #     project#3 -> Link to project with id 3
               #
               #   Links can refer other objects from other projects, using project identifier:
               #     identifier:r52
               #     identifier:document:"Some document"
               #     identifier:version:1.0.0
               #     identifier:source:some/file
               def parse_redmine_links(text, default_project, obj, attr, only_path, options)
                 text.gsub!(%r{<a( [^>]+?)?>(.*?)</a>|([\s\(,\-\[\>]|^)(!)?(([a-z0-9\-_]+):)?(attachment|document|version|forum|news|message|project|commit|source|export)?(((#)|((([a-z0-9\-_]+)\|)?(r)))((\d+)((#note)?-(\d+))?)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]][^A-Za-z0-9_/])|,|\s|\]|<|$)}) do |m|
                   tag_content, leading, esc, project_prefix, project_identifier, prefix, repo_prefix, repo_identifier, sep, identifier, comment_suffix, comment_id = $2, $3, $4, $5, $6, $7, $12, $13, $10 || $14 || $20, $16 || $21, $17, $19
                   if tag_content
                     $&
                   else
                     link = nil
                     project = default_project
                     if project_identifier
                       project = Project.visible.find_by_identifier(project_identifier)
                     end
                     if esc.nil?
                       if prefix.nil? && sep == 'r'
                         if project
                           repository = nil
                           if repo_identifier
                             repository = project.repositories.detect {|repo| repo.identifier == repo_identifier}
                           else
                             repository = project.repository
                           end
                           # project.changesets.visible raises an SQL error because of a double join on repositories
                           if repository &&
                                (changeset = Changeset.visible.
                                                 find_by_repository_id_and_revision(repository.id, identifier))
                             link = link_to(h("#{project_prefix}#{repo_prefix}r#{identifier}"),
                                            {:only_path => only_path, :controller => 'repositories',
                                             :action => 'revision', :id => project,
                                             :repository_id => repository.identifier_param,
                                             :rev => changeset.revision},
                                            :class => 'changeset',
                                            :title => truncate_single_line_raw(changeset.comments, 100))
                           end
                         end
                       elsif sep == '#'
                         oid = identifier.to_i
                         case prefix
                         when nil
                           if oid.to_s == identifier &&
                             issue = Issue.visible.find_by_id(oid)
                             anchor = comment_id ? "note-#{comment_id}" : nil
                             link = link_to("##{oid}#{comment_suffix}",
                                            issue_url(issue, :only_path => only_path, :anchor => anchor),
                                            :class => issue.css_classes,
                                            :title => "#{issue.tracker.name}: #{issue.subject.truncate(100)} (#{issue.status.name})")
                           end
                         when 'document'
                           if document = Document.visible.find_by_id(oid)
                             link = link_to(document.title, document_url(document, :only_path => only_path), :class => 'document')
                           end
                         when 'version'
                           if version = Version.visible.find_by_id(oid)
                             link = link_to(version.name, version_url(version, :only_path => only_path), :class => 'version')
                           end
                         when 'message'
                           if message = Message.visible.find_by_id(oid)
                             link = link_to_message(message, {:only_path => only_path}, :class => 'message')
                           end
                         when 'forum'
                           if board = Board.visible.find_by_id(oid)
                             link = link_to(board.name, project_board_url(board.project, board, :only_path => only_path), :class => 'board')
                           end
                         when 'news'
                           if news = News.visible.find_by_id(oid)
                             link = link_to(news.title, news_url(news, :only_path => only_path), :class => 'news')
                           end
                         when 'project'
                           if p = Project.visible.find_by_id(oid)
                             link = link_to_project(p, {:only_path => only_path}, :class => 'project')
                           end
                         end
                       elsif sep == ':'
                         # removes the double quotes if any
                         name = identifier.gsub(%r{^"(.*)"$}, "\\1")
                         name = CGI.unescapeHTML(name)
                         case prefix
                         when 'document'
                           if project && document = project.documents.visible.find_by_title(name)
                             link = link_to(document.title, document_url(document, :only_path => only_path), :class => 'document')
                           end
                         when 'version'
                           if project && version = project.versions.visible.find_by_name(name)
                             link = link_to(version.name, version_url(version, :only_path => only_path), :class => 'version')
                           end
                         when 'forum'
                           if project && board = project.boards.visible.find_by_name(name)
                             link = link_to(board.name, project_board_url(board.project, board, :only_path => only_path), :class => 'board')
                           end
                         when 'news'
                           if project && news = project.news.visible.find_by_title(name)
                             link = link_to(news.title, news_url(news, :only_path => only_path), :class => 'news')
                           end
                         when 'commit', 'source', 'export'
                           if project
                             repository = nil
                             if name =~ %r{^(([a-z0-9\-_]+)\|)(.+)$}
                               repo_prefix, repo_identifier, name = $1, $2, $3
                               repository = project.repositories.detect {|repo| repo.identifier == repo_identifier}
                             else
                               repository = project.repository
                             end
                             if prefix == 'commit'
                               if repository && (changeset = Changeset.visible.where("repository_id = ? AND scmid LIKE ?", repository.id, "#{name}%").first)
                                 link = link_to h("#{project_prefix}#{repo_prefix}#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :repository_id => repository.identifier_param, :rev => changeset.identifier},
                                                              :class => 'changeset',
                                                              :title => truncate_single_line_raw(changeset.comments, 100)
                               end
                             else
                               if repository && User.current.allowed_to?(:browse_repository, project)
                                 name =~ %r{^[/\\]*(.*?)(@([^/\\@]+?))?(#(L\d+))?$}
                                 path, rev, anchor = $1, $3, $5
                                 link = link_to h("#{project_prefix}#{prefix}:#{repo_prefix}#{name}"), {:only_path => only_path, :controller => 'repositories', :action => (prefix == 'export' ? 'raw' : 'entry'), :id => project, :repository_id => repository.identifier_param,
                                                                         :path => to_path_param(path),
                                                                         :rev => rev,
                                                                         :anchor => anchor},
                                                                        :class => (prefix == 'export' ? 'source download' : 'source')
                               end
                             end
                             repo_prefix = nil
                           end
                         when 'attachment'
                           attachments = options[:attachments] || []
                           attachments += obj.attachments if obj.respond_to?(:attachments)
                           if attachments && attachment = Attachment.latest_attach(attachments, name)
                             link = link_to_attachment(attachment, :only_path => only_path, :download => true, :class => 'attachment')
                           end
                         when 'project'
                           if p = Project.visible.where("identifier = :s OR LOWER(name) = :s", :s => name.downcase).first
                             link = link_to_project(p, {:only_path => only_path}, :class => 'project')
                           end
                         end
                       end
                     end
                     (leading + (link || "#{project_prefix}#{prefix}#{repo_prefix}#{sep}#{identifier}#{comment_suffix}"))
                   end
                 end
               end
               HEADING_RE = /(<h(\d)( [^>]+)?>(.+?)<\/h(\d)>)/i unless const_defined?(:HEADING_RE)
               def parse_sections(text, project, obj, attr, only_path, options)
                 return unless options[:edit_section_links]
                 text.gsub!(HEADING_RE) do
                   heading, level = $1, $2
                   @current_section += 1
                   if @current_section > 1
                     content_tag('div',
                       link_to(l(:button_edit_section), options[:edit_section_links].merge(:section => @current_section),
                               :class => 'icon-only icon-edit'),
                       :class => "contextual heading-#{level}",
                       :title => l(:button_edit_section),
                       :id => "section-#{@current_section}") + heading.html_safe
                   else
                     heading
                   end
                 end
               end
               # Headings and TOC
               # Adds ids and links to headings unless options[:headings] is set to false
               def parse_headings(text, project, obj, attr, only_path, options)
                 return if options[:headings] == false
                 text.gsub!(HEADING_RE) do
                   level, attrs, content = $2.to_i, $3, $4
                   item = strip_tags(content).strip
                   anchor = sanitize_anchor_name(item)
                   # used for single-file wiki export
                   anchor = "#{obj.page.title}_#{anchor}" if options[:wiki_links] == :anchor && (obj.is_a?(WikiContent) || obj.is_a?(WikiContent::Version))
                   @heading_anchors[anchor] ||= 0
                   idx = (@heading_anchors[anchor] += 1)
                   if idx > 1
                     anchor = "#{anchor}-#{idx}"
                   end
                   @parsed_headings << [level, anchor, item]
                   "<a name=\"#{anchor}\"></a>\n<h#{level} #{attrs}>#{content}<a href=\"##{anchor}\" class=\"wiki-anchor\">&para;</a></h#{level}>"
                 end
               end
               MACROS_RE = /(
                             (!)?                        # escaping
                             (
                             \{\{                        # opening tag
                             ([\w]+)                     # macro name
                             (\(([^\n\r]*?)\))?          # optional arguments
                             ([\n\r].*?[\n\r])?          # optional block of text
                             \}\}                        # closing tag
                             )
                            )/mx unless const_defined?(:MACROS_RE)
               MACRO_SUB_RE = /(
                               \{\{
                               macro\((\d+)\)
                               \}\}
                               )/x unless const_defined?(:MACRO_SUB_RE)
               # Extracts macros from text
               def catch_macros(text)
                 macros = {}
                 text.gsub!(MACROS_RE) do
                   all, macro = $1, $4.downcase
                   if macro_exists?(macro) || all =~ MACRO_SUB_RE
                     index = macros.size
                     macros[index] = all
                     "{{macro(#{index})}}"
                   else
                     all
                   end
                 end
                 macros
               end
               # Executes and replaces macros in text
               def inject_macros(text, obj, macros, execute=true)
                 text.gsub!(MACRO_SUB_RE) do
                   all, index = $1, $2.to_i
                   orig = macros.delete(index)
                   if execute && orig && orig =~ MACROS_RE
                     esc, all, macro, args, block = $2, $3, $4.downcase, $6.to_s, $7.try(:strip)
                     if esc.nil?
                       h(exec_macro(macro, obj, args, block) || all)
                     else
                       h(all)
                     end
                   elsif orig
                     h(orig)
                   else
                     h(all)
                   end
                 end
               end
               TOC_RE = /<p>\{\{((<|&lt;)|(>|&gt;))?toc\}\}<\/p>/i unless const_defined?(:TOC_RE)
               # Renders the TOC with given headings
               def replace_toc(text, headings)
                 text.gsub!(TOC_RE) do
                   left_align, right_align = $2, $3
                   # Keep only the 4 first levels
                   headings = headings.select{|level, anchor, item| level <= 4}
                   if headings.empty?
                     ''
                   else
                     div_class = 'toc'
                     div_class << ' right' if right_align
                     div_class << ' left' if left_align
                     out = "<ul class=\"#{div_class}\"><li>"
                     root = headings.map(&:first).min
                     current = root
                     started = false
                     headings.each do |level, anchor, item|
                       if level > current
                         out << '<ul><li>' * (level - current)
                       elsif level < current
                         out << "</li></ul>\n" * (current - level) + "</li><li>"
                       elsif started
                         out << '</li><li>'
                       end
                       out << "<a href=\"##{anchor}\">#{item}</a>"
                       current = level
                       started = true
                     end
                     out << '</li></ul>' * (current - root)
                     out << '</li></ul>'
                   end
                 end
               end
               # Same as Rails' simple_format helper without using paragraphs
               def simple_format_without_paragraph(text)
                 text.to_s.
                   gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
                   gsub(/\n\n+/, "<br /><br />").          # 2+ newline  -> 2 br
                   gsub(/([^\n]\n)(?=[^\n])/, '\1<br />'). # 1 newline   -> br
                   html_safe
               end
               def lang_options_for_select(blank=true)
                 (blank ? [["(auto)", ""]] : []) + languages_options
               end
               def labelled_form_for(*args, &proc)
                 args << {} unless args.last.is_a?(Hash)
                 options = args.last
                 if args.first.is_a?(Symbol)
                   options.merge!(:as => args.shift)
                 end
                 options.merge!({:builder => Redmine::Views::LabelledFormBuilder})
                 form_for(*args, &proc)
               end
               def labelled_fields_for(*args, &proc)
                 args << {} unless args.last.is_a?(Hash)
                 options = args.last
                 options.merge!({:builder => Redmine::Views::LabelledFormBuilder})
                 fields_for(*args, &proc)
               end
               # Render the error messages for the given objects
               def error_messages_for(*objects)
                 objects = objects.map {|o| o.is_a?(String) ? instance_variable_get("@#{o}") : o}.compact
                 errors = objects.map {|o| o.errors.full_messages}.flatten
                 render_error_messages(errors)
               end
               # Renders a list of error messages
               def render_error_messages(errors)
                 html = ""
                 if errors.present?
                   html << "<div id='errorExplanation'><ul>\n"
                   errors.each do |error|
                     html << "<li>#{h error}</li>\n"
                   end
                   html << "</ul></div>\n"
                 end
                 html.html_safe
               end
               def delete_link(url, options={})
                 options = {
                   :method => :delete,
                   :data => {:confirm => l(:text_are_you_sure)},
                   :class => 'icon icon-del'
                 }.merge(options)
                 link_to l(:button_delete), url, options
               end
               def preview_link(url, form, target='preview', options={})
                 content_tag 'a', l(:label_preview), {
                     :href => "#",
                     :onclick => %|submitPreview("#{escape_javascript url_for(url)}", "#{escape_javascript form}", "#{escape_javascript target}"); return false;|,
                     :accesskey => accesskey(:preview)
                   }.merge(options)
               end
               def link_to_function(name, function, html_options={})
                 content_tag(:a, name, {:href => '#', :onclick => "#{function}; return false;"}.merge(html_options))
               end
               # Helper to render JSON in views
               def raw_json(arg)
                 arg.to_json.to_s.gsub('/', '\/').html_safe
               end
               def back_url
                 url = params[:back_url]
                 if url.nil? && referer = request.env['HTTP_REFERER']
                   url = CGI.unescape(referer.to_s)
                   # URLs that contains the utf8=[checkmark] parameter added by Rails are
                   # parsed as invalid by URI.parse so the redirect to the back URL would
                   # not be accepted (ApplicationController#validate_back_url would return
                   # false)
                   url.gsub!(/(\?|&)utf8=\u2713&?/, '\1')
                 end
                 url
               end
               def back_url_hidden_field_tag
                 url = back_url
                 hidden_field_tag('back_url', url, :id => nil) unless url.blank?
               end
               def check_all_links(form_name)
                 link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
                 " | ".html_safe +
                 link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
               end
               def toggle_checkboxes_link(selector)
                 link_to_function '',
                   "toggleCheckboxesBySelector('#{selector}')",
                   :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}",
                   :class => 'toggle-checkboxes'
               end
               def progress_bar(pcts, options={})
                 pcts = [pcts, pcts] unless pcts.is_a?(Array)
                 pcts = pcts.collect(&:round)
                 pcts[1] = pcts[1] - pcts[0]
                 pcts << (100 - pcts[1] - pcts[0])
                 titles = options[:titles].to_a
                 titles[0] = "#{pcts[0]}%" if titles[0].blank?
                 legend = options[:legend] || ''
                 content_tag('table',
                   content_tag('tr',
                     (pcts[0] > 0 ? content_tag('td', '', :style => "width: #{pcts[0]}%;", :class => 'closed', :title => titles[0]) : ''.html_safe) +
                     (pcts[1] > 0 ? content_tag('td', '', :style => "width: #{pcts[1]}%;", :class => 'done', :title => titles[1]) : ''.html_safe) +
                     (pcts[2] > 0 ? content_tag('td', '', :style => "width: #{pcts[2]}%;", :class => 'todo', :title => titles[2]) : ''.html_safe)
                   ), :class => "progress progress-#{pcts[0]}").html_safe +
                   content_tag('p', legend, :class => 'percent').html_safe
               end
               def checked_image(checked=true)
                 if checked
                   @checked_image_tag ||= content_tag(:span, nil, :class => 'icon-only icon-checked')
                 end
               end
               def context_menu(url)
                 unless @context_menu_included
                   content_for :header_tags do
                     javascript_include_tag('context_menu') +
                       stylesheet_link_tag('context_menu')
                   end
                   if l(:direction) == 'rtl'
                     content_for :header_tags do
                       stylesheet_link_tag('context_menu_rtl')
                     end
                   end
                   @context_menu_included = true
                 end
                 javascript_tag "contextMenuInit('#{ url_for(url) }')"
               end
               def calendar_for(field_id)
                 include_calendar_headers_tags
                 javascript_tag("$(function() { $('##{field_id}').addClass('date').datepickerFallback(datepickerOptions); });")
               end
               def include_calendar_headers_tags
                 unless @calendar_headers_tags_included
                   tags = ''.html_safe
                   @calendar_headers_tags_included = true
                   content_for :header_tags do
                     start_of_week = Setting.start_of_week
                     start_of_week = l(:general_first_day_of_week, :default => '1') if start_of_week.blank?
                     # Redmine uses 1..7 (monday..sunday) in settings and locales
                     # JQuery uses 0..6 (sunday..saturday), 7 needs to be changed to 0
                     start_of_week = start_of_week.to_i % 7
                     tags << javascript_tag(
                                "var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: #{start_of_week}, " +
                                  "showOn: 'button', buttonImageOnly: true, buttonImage: '" +
                                  path_to_image('/images/calendar.png') +
                                  "', showButtonPanel: true, showWeek: true, showOtherMonths: true, " +
                                  "selectOtherMonths: true, changeMonth: true, changeYear: true, " +
                                  "beforeShow: beforeShowDatePicker};")
                     jquery_locale = l('jquery.locale', :default => current_language.to_s)
                     unless jquery_locale == 'en'
                       tags << javascript_include_tag("i18n/datepicker-#{jquery_locale}.js")
                     end
                     tags
                   end
                 end
               end
               # Overrides Rails' stylesheet_link_tag with themes and plugins support.
               # Examples:
               #   stylesheet_link_tag('styles') # => picks styles.css from the current theme or defaults
               #   stylesheet_link_tag('styles', :plugin => 'foo) # => picks styles.css from plugin's assets
               #
               def stylesheet_link_tag(*sources)
                 options = sources.last.is_a?(Hash) ? sources.pop : {}
                 plugin = options.delete(:plugin)
                 sources = sources.map do |source|
                   if plugin
                     "/plugin_assets/#{plugin}/stylesheets/#{source}"
                   elsif current_theme && current_theme.stylesheets.include?(source)
                     current_theme.stylesheet_path(source)
                   else
                     source
                   end
                 end
                 super *sources, options
               end
               # Overrides Rails' image_tag with themes and plugins support.
               # Examples:
               #   image_tag('image.png') # => picks image.png from the current theme or defaults
               #   image_tag('image.png', :plugin => 'foo) # => picks image.png from plugin's assets
               #
               def image_tag(source, options={})
                 if plugin = options.delete(:plugin)
                   source = "/plugin_assets/#{plugin}/images/#{source}"
                 elsif current_theme && current_theme.images.include?(source)
                   source = current_theme.image_path(source)
                 end
                 super source, options
               end
               # Overrides Rails' javascript_include_tag with plugins support
               # Examples:
               #   javascript_include_tag('scripts') # => picks scripts.js from defaults
               #   javascript_include_tag('scripts', :plugin => 'foo) # => picks scripts.js from plugin's assets
               #
               def javascript_include_tag(*sources)
                 options = sources.last.is_a?(Hash) ? sources.pop : {}
                 if plugin = options.delete(:plugin)
                   sources = sources.map do |source|
                     if plugin
                       "/plugin_assets/#{plugin}/javascripts/#{source}"
                     else
                       source
                     end
                   end
                 end
                 super *sources, options
               end
               def sidebar_content?
                 content_for?(:sidebar) || view_layouts_base_sidebar_hook_response.present?
               end
               def view_layouts_base_sidebar_hook_response
                 @view_layouts_base_sidebar_hook_response ||= call_hook(:view_layouts_base_sidebar)
               end
               def email_delivery_enabled?
                 !!ActionMailer::Base.perform_deliveries
               end
               # Returns the avatar image tag for the given +user+ if avatars are enabled
               # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>')
               def avatar(user, options = { })
                 if Setting.gravatar_enabled?
                   options.merge!(:default => Setting.gravatar_default)
                   email = nil
                   if user.respond_to?(:mail)
                     email = user.mail
                   elsif user.to_s =~ %r{<(.+?)>}
                     email = $1
                   end
                   return gravatar(email.to_s.downcase, options) unless email.blank? rescue nil
                 else
                   ''
                 end
               end
               # Returns a link to edit user's avatar if avatars are enabled
               def avatar_edit_link(user, options={})
                 if Setting.gravatar_enabled?
                   url = "https://gravatar.com"
                   link_to avatar(user, {:title => l(:button_edit)}.merge(options)), url, :target => '_blank'
                 end
               end
               def sanitize_anchor_name(anchor)
                 anchor.gsub(%r{[^\s\-\p{Word}]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
               end
               # Returns the javascript tags that are included in the html layout head
               def javascript_heads
                 tags = javascript_include_tag('jquery-1.11.1-ui-1.11.0-ujs-3.1.4', 'application', 'responsive')
                 unless User.current.pref.warn_on_leaving_unsaved == '0'
                   tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
                 end
                 tags
               end
               def favicon
                 "<link rel='shortcut icon' href='#{favicon_path}' />".html_safe
               end
               # Returns the path to the favicon
               def favicon_path
                 icon = (current_theme && current_theme.favicon?) ? current_theme.favicon_path : '/favicon.ico'
                 image_path(icon)
               end
               # Returns the full URL to the favicon
               def favicon_url
                 # TODO: use #image_url introduced in Rails4
                 path = favicon_path
                 base = url_for(:controller => 'welcome', :action => 'index', :only_path => false)
                 base.sub(%r{/+$},'') + '/' + path.sub(%r{^/+},'')
               end
               def robot_exclusion_tag
                 '<meta name="robots" content="noindex,follow,noarchive" />'.html_safe
               end
               # Returns true if arg is expected in the API response
               def include_in_api_response?(arg)
                 unless @included_in_api_response
                   param = params[:include]
                   @included_in_api_response = param.is_a?(Array) ? param.collect(&:to_s) : param.to_s.split(',')
                   @included_in_api_response.collect!(&:strip)
                 end
                 @included_in_api_response.include?(arg.to_s)
               end
               # Returns options or nil if nometa param or X-Redmine-Nometa header
               # was set in the request
               def api_meta(options)
                 if params[:nometa].present? || request.headers['X-Redmine-Nometa']
                   # compatibility mode for activeresource clients that raise
                   # an error when deserializing an array with attributes
                   nil
                 else
                   options
                 end
               end
               def generate_csv(&block)
                 decimal_separator = l(:general_csv_decimal_separator)
                 encoding = l(:general_csv_encoding)
               end
               private
               def wiki_helper
                 helper = Redmine::WikiFormatting.helper_for(Setting.text_formatting)
                 extend helper
                 return self
               end
             end

app/helpers/issues_helper.rb +7 -2

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module IssuesHelper
               include ApplicationHelper
               include Redmine::Export::PDF::IssuesPdfHelper
               def issue_list(issues, &block)
                 ancestors = []
                 issues.each do |issue|
                   while (ancestors.any? && !issue.is_descendant_of?(ancestors.last))
                     ancestors.pop
                   end
                   yield issue, ancestors.size
                   ancestors << issue unless issue.leaf?
                 end
               end
               def grouped_issue_list(issues, query, issue_count_by_group, &block)
                 ancestors = []
                 grouped_query_results(issues, query, issue_count_by_group) do |issue, group_name, group_count, group_totals|
                   while (ancestors.any? && !issue.is_descendant_of?(ancestors.last))
                     ancestors.pop
                   end
                   yield issue, ancestors.size, group_name, group_count, group_totals
                   ancestors << issue unless issue.leaf?
                 end
               end
               # Renders a HTML/CSS tooltip
               #
               # To use, a trigger div is needed.  This is a div with the class of "tooltip"
               # that contains this method wrapped in a span with the class of "tip"
               #
               #    <div class="tooltip"><%= link_to_issue(issue) %>
               #      <span class="tip"><%= render_issue_tooltip(issue) %></span>
               #    </div>
               #
               def render_issue_tooltip(issue)
                 @cached_label_status ||= l(:field_status)
                 @cached_label_start_date ||= l(:field_start_date)
                 @cached_label_due_date ||= l(:field_due_date)
                 @cached_label_assigned_to ||= l(:field_assigned_to)
                 @cached_label_priority ||= l(:field_priority)
                 @cached_label_project ||= l(:field_project)
                 link_to_issue(issue) + "<br /><br />".html_safe +
                   "<strong>#{@cached_label_project}</strong>: #{link_to_project(issue.project)}<br />".html_safe +
                   "<strong>#{@cached_label_status}</strong>: #{h(issue.status.name)}<br />".html_safe +
                   "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />".html_safe +
                   "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />".html_safe +
                   "<strong>#{@cached_label_assigned_to}</strong>: #{h(issue.assigned_to)}<br />".html_safe +
                   "<strong>#{@cached_label_priority}</strong>: #{h(issue.priority.name)}".html_safe
               end
               def issue_heading(issue)
                 h("#{issue.tracker} ##{issue.id}")
               end
               def render_issue_subject_with_tree(issue)
                 s = ''
                 ancestors = issue.root? ? [] : issue.ancestors.visible.to_a
                 ancestors.each do |ancestor|
                   s << '<div>' + content_tag('p', link_to_issue(ancestor, :project => (issue.project_id != ancestor.project_id)))
                 end
                 s << '<div>'
                 subject = h(issue.subject)
                 if issue.is_private?
                   subject = content_tag('span', l(:field_is_private), :class => 'private') + ' ' + subject
                 end
                 s << content_tag('h3', subject)
                 s << '</div>' * (ancestors.size + 1)
                 s.html_safe
               end
               def render_descendants_tree(issue)
                 s = '<form><table class="list issues">'
                 issue_list(issue.descendants.visible.preload(:status, :priority, :tracker, :assigned_to).sort_by(&:lft)) do |child, level|
                   css = "issue issue-#{child.id} hascontextmenu #{child.css_classes}"
                   css << " idnt idnt-#{level}" if level > 0
                   s << content_tag('tr',
                          content_tag('td', check_box_tag("ids[]", child.id, false, :id => nil), :class => 'checkbox') +
                          content_tag('td', link_to_issue(child, :project => (issue.project_id != child.project_id)), :class => 'subject', :style => 'width: 50%') +
                          content_tag('td', h(child.status), :class => 'status') +
                          content_tag('td', link_to_user(child.assigned_to), :class => 'assigned_to') +
                          content_tag('td', child.disabled_core_fields.include?('done_ratio') ? '' : progress_bar(child.done_ratio), :class=> 'done_ratio'),
                          :class => css)
                 end
                 s << '</table></form>'
                 s.html_safe
               end
               def issue_estimated_hours_details(issue)
                 if issue.total_estimated_hours.present?
                   if issue.total_estimated_hours == issue.estimated_hours
                     l_hours_short(issue.estimated_hours)
                   else
                     s = issue.estimated_hours.present? ? l_hours_short(issue.estimated_hours) : ""
                     s << " (#{l(:label_total)}: #{l_hours_short(issue.total_estimated_hours)})"
                     s.html_safe
                   end
                 end
               end
               def issue_spent_hours_details(issue)
                 if issue.total_spent_hours > 0
                   path = project_time_entries_path(issue.project, :issue_id => "~#{issue.id}")
                   if issue.total_spent_hours == issue.spent_hours
                     link_to(l_hours_short(issue.spent_hours), path)
                   else
                     s = issue.spent_hours > 0 ? l_hours_short(issue.spent_hours) : ""
                     s << " (#{l(:label_total)}: #{link_to l_hours_short(issue.total_spent_hours), path})"
                     s.html_safe
                   end
                 end
               end
               # Returns an array of error messages for bulk edited issues
               def bulk_edit_error_messages(issues)
                 messages = {}
                 issues.each do |issue|
                   issue.errors.full_messages.each do |message|
                     messages[message] ||= []
                     messages[message] << issue
                   end
                 end
                 messages.map { |message, issues|
                   "#{message}: " + issues.map {|i| "##{i.id}"}.join(', ')
                 }
              end
               # Returns a link for adding a new subtask to the given issue
               def link_to_new_subtask(issue)
                 attrs = {
                   :parent_issue_id => issue
                 }
                 attrs[:tracker_id] = issue.tracker unless issue.tracker.disabled_core_fields.include?('parent_issue_id')
                 link_to(l(:button_add), new_project_issue_path(issue.project, :issue => attrs))
               end
               def trackers_options_for_select(issue)
                 trackers = issue.allowed_target_trackers
                 if issue.new_record? && issue.parent_issue_id.present?
                   trackers = trackers.reject do |tracker|
                     issue.tracker_id != tracker.id && tracker.disabled_core_fields.include?('parent_issue_id')
                   end
                 end
                 trackers.collect {|t| [t.name, t.id]}
               end
               class IssueFieldsRows
                 include ActionView::Helpers::TagHelper
                 def initialize
                   @left = []
                   @right = []
                 end
                 def left(*args)
                   args.any? ? @left << cells(*args) : @left
                 end
                 def right(*args)
                   args.any? ? @right << cells(*args) : @right
                 end
                 def size
                   @left.size > @right.size ? @left.size : @right.size
                 end
                 def to_html
                   content =
                     content_tag('div', @left.reduce(&:+), :class => 'splitcontentleft') +
                     content_tag('div', @right.reduce(&:+), :class => 'splitcontentleft')
                   content_tag('div', content, :class => 'splitcontent')
                 end
                 def cells(label, text, options={})
                   options[:class] = [options[:class] || "", 'attribute'].join(' ')
                   content_tag 'div',
                     content_tag('div', label + ":", :class => 'label') + content_tag('div', text, :class => 'value'),
                     options
                 end
               end
               def issue_fields_rows
                 r = IssueFieldsRows.new
                 yield r
                 r.to_html
               end
               def render_custom_fields_rows(issue)
                 values = issue.visible_custom_field_values
                 return if values.empty?
                 half = (values.size / 2.0).ceil
                 issue_fields_rows do |rows|
                   values.each_with_index do |value, i|
                     css = "cf_#{value.custom_field.id}"
                     m = (i < half ? :left : :right)
                     rows.send m, custom_field_name_tag(value.custom_field), show_value(value), :class => css
                   end
                 end
               end
               # Returns the path for updating the issue form
               # with project as the current project
               def update_issue_form_path(project, issue)
                 options = {:format => 'js'}
                 if issue.new_record?
                   if project
                     new_project_issue_path(project, options)
                   else
                     new_issue_path(options)
                   end
                 else
                   edit_issue_path(issue, options)
                 end
               end
               # Returns the number of descendants for an array of issues
               def issues_descendant_count(issues)
                 ids = issues.reject(&:leaf?).map {|issue| issue.descendants.ids}.flatten.uniq
                 ids -= issues.map(&:id)
                 ids.size
               end
               def issues_destroy_confirmation_message(issues)
                 issues = [issues] unless issues.is_a?(Array)
                 message = l(:text_issues_destroy_confirmation)
                 descendant_count = issues_descendant_count(issues)
                 if descendant_count > 0
                   message << "\n" + l(:text_issues_destroy_descendants_confirmation, :count => descendant_count)
                 end
                 message
               end
               # Returns an array of users that are proposed as watchers
               # on the new issue form
               def users_for_new_issue_watchers(issue)
                 users = issue.watcher_users
                 if issue.project.users.count <= 20
                   users = (users + issue.project.users.sort).uniq
                 end
                 users
               end
               def email_issue_attributes(issue, user)
                 items = []
                 %w(author status priority assigned_to category fixed_version).each do |attribute|
                   unless issue.disabled_core_fields.include?(attribute+"_id")
                     items << "#{l("field_#{attribute}")}: #{issue.send attribute}"
                   end
                 end
                 issue.visible_custom_field_values(user).each do |value|
                   items << "#{value.custom_field.name}: #{show_value(value, false)}"
                 end
                 items
               end
               def render_email_issue_attributes(issue, user, html=false)
                 items = email_issue_attributes(issue, user)
                 if html
                   content_tag('ul', items.map{|s| content_tag('li', s)}.join("\n").html_safe)
                 else
                   items.map{|s| "* #{s}"}.join("\n")
                 end
               end
               # Returns the textual representation of a journal details
               # as an array of strings
               def details_to_strings(details, no_html=false, options={})
                 options[:only_path] = (options[:only_path] == false ? false : true)
                 strings = []
                 values_by_field = {}
                 details.each do |detail|
                   if detail.property == 'cf'
                     field = detail.custom_field
                     if field && field.multiple?
                       values_by_field[field] ||= {:added => [], :deleted => []}
                       if detail.old_value
                         values_by_field[field][:deleted] << detail.old_value
                       end
                       if detail.value
                         values_by_field[field][:added] << detail.value
                       end
                       next
                     end
                   end
                   strings << show_detail(detail, no_html, options)
                 end
                 if values_by_field.present?
                   multiple_values_detail = Struct.new(:property, :prop_key, :custom_field, :old_value, :value)
                   values_by_field.each do |field, changes|
                     if changes[:added].any?
                       detail = multiple_values_detail.new('cf', field.id.to_s, field)
                       detail.value = changes[:added]
                       strings << show_detail(detail, no_html, options)
                     end
                     if changes[:deleted].any?
                       detail = multiple_values_detail.new('cf', field.id.to_s, field)
                       detail.old_value = changes[:deleted]
                       strings << show_detail(detail, no_html, options)
                     end
                   end
                 end
                 strings
               end
               # Returns the textual representation of a single journal detail
               def show_detail(detail, no_html=false, options={})
                 multiple = false
                 show_diff = false
+                no_details = false
                 case detail.property
                 when 'attr'
                   field = detail.prop_key.to_s.gsub(/\_id$/, "")
                   label = l(("field_" + field).to_sym)
                   case detail.prop_key
                   when 'due_date', 'start_date'
                     value = format_date(detail.value.to_date) if detail.value
                     old_value = format_date(detail.old_value.to_date) if detail.old_value
                   when 'project_id', 'status_id', 'tracker_id', 'assigned_to_id',
                         'priority_id', 'category_id', 'fixed_version_id'
                     value = find_name_by_reflection(field, detail.value)
                     old_value = find_name_by_reflection(field, detail.old_value)
                   when 'estimated_hours'
                     value = l_hours_short(detail.value.to_f) unless detail.value.blank?
                     old_value = l_hours_short(detail.old_value.to_f) unless detail.old_value.blank?
                   when 'parent_id'
                     label = l(:field_parent_issue)
                     value = "##{detail.value}" unless detail.value.blank?
                     old_value = "##{detail.old_value}" unless detail.old_value.blank?
                   when 'is_private'
                     value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank?
                     old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank?
                   when 'description'
                     show_diff = true
                   end
                 when 'cf'
                   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?
                       value = format_value(detail.value, custom_field) if detail.value
                       old_value = format_value(detail.old_value, custom_field) if detail.old_value
                     end
                   end
                 when 'attachment'
                   label = l(:label_attachment)
                 when 'relation'
                   if detail.value && !detail.old_value
                     rel_issue = Issue.visible.find_by_id(detail.value)
                     value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.value}" :
                               (no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path]))
                   elsif detail.old_value && !detail.value
                     rel_issue = Issue.visible.find_by_id(detail.old_value)
                     old_value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.old_value}" :
                                       (no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path]))
                   end
                   relation_type = IssueRelation::TYPES[detail.prop_key]
                   label = l(relation_type[:name]) if relation_type
                 end
                 call_hook(:helper_issues_show_detail_after_setting,
                           {:detail => detail, :label => label, :value => value, :old_value => old_value })
                 label ||= detail.prop_key
                 value ||= detail.value
                 old_value ||= detail.old_value
                 unless no_html
                   label = content_tag('strong', label)
                   old_value = content_tag("i", h(old_value)) if detail.old_value
                   if detail.old_value && detail.value.blank? && detail.property != 'relation'
                     old_value = content_tag("del", old_value)
                   end
                   if detail.property == 'attachment' && value.present? &&
                       atta = detail.journal.journalized.attachments.detect {|a| a.id == detail.prop_key.to_i}
                     # Link to the attachment if it has not been removed
                     value = link_to_attachment(atta, :download => true, :only_path => options[:only_path])
                     if options[:only_path] != false && (atta.is_text? || atta.is_image?)
                       value += ' '
                       value += link_to(l(:button_view),
                                        { :controller => 'attachments', :action => 'show',
                                          :id => atta, :filename => atta.filename },
                                        :class => 'icon-only icon-magnifier',
                                        :title => l(:button_view))
                     end
                   else
                     value = content_tag("i", h(value)) if value
                   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',
                       diff_journal_url(detail.journal_id, :detail_id => detail.id, :only_path => options[:only_path]),
                       :title => l(:label_view_diff)
                     s << " (#{ diff_link })"
                   end
                   s.html_safe
                 elsif detail.value.present?
                   case detail.property
                   when 'attr', 'cf'
                     if detail.old_value.present?
                       l(:text_journal_changed, :label => label, :old => old_value, :new => value).html_safe
                     elsif multiple
                       l(:text_journal_added, :label => label, :value => value).html_safe
                     else
                       l(:text_journal_set_to, :label => label, :value => value).html_safe
                     end
                   when 'attachment', 'relation'
                     l(:text_journal_added, :label => label, :value => value).html_safe
                   end
                 else
                   l(:text_journal_deleted, :label => label, :old => old_value).html_safe
                 end
               end
               # Find the name of an associated record stored in the field attribute
               def find_name_by_reflection(field, id)
                 unless id.present?
                   return nil
                 end
                 @detail_value_name_by_reflection ||= Hash.new do |hash, key|
                   association = Issue.reflect_on_association(key.first.to_sym)
                   name = nil
                   if association
                     record = association.klass.find_by_id(key.last)
                     if record
                       name = record.name.force_encoding('UTF-8')
                     end
                   end
                   hash[key] = name
                 end
                 @detail_value_name_by_reflection[[field, id]]
               end
               # Renders issue children recursively
               def render_api_issue_children(issue, api)
                 return if issue.leaf?
                 api.array :children do
                   issue.children.each do |child|
                     api.issue(:id => child.id) do
                       api.tracker(:id => child.tracker_id, :name => child.tracker.name) unless child.tracker.nil?
                       api.subject child.subject
                       render_api_issue_children(child, api)
                     end
                   end
                 end
               end
             end

app/models/custom_field.rb +23 -12

             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class CustomField < ActiveRecord::Base
               include Redmine::SafeAttributes
               include Redmine::SubclassFactory
               has_many :enumerations,
                        lambda { order(:position) },
                        :class_name => 'CustomFieldEnumeration',
                        :dependent => :delete_all
               has_many :custom_values, :dependent => :delete_all
               has_and_belongs_to_many :roles, :join_table => "#{table_name_prefix}custom_fields_roles#{table_name_suffix}", :foreign_key => "custom_field_id"
               acts_as_positioned
               serialize :possible_values
               store :format_store
               validates_presence_of :name, :field_format
               validates_uniqueness_of :name, :scope => :type
               validates_length_of :name, :maximum => 30
               validates_inclusion_of :field_format, :in => Proc.new { Redmine::FieldFormat.available_formats }
               validate :validate_custom_field
               attr_protected :id
               before_validation :set_searchable
               before_save do |field|
                 field.format.before_custom_field_save(field)
               end
               after_save :handle_multiplicity_change
               after_save do |field|
                 if field.visible_changed? && field.visible
                   field.roles.clear
                 end
               end
               scope :sorted, lambda { order(:position) }
               scope :visible, lambda {|*args|
                 user = args.shift || User.current
                 if user.admin?
                   # nop
                 elsif user.memberships.any?
                   where("#{table_name}.visible = ? OR #{table_name}.id IN (SELECT DISTINCT cfr.custom_field_id FROM #{Member.table_name} m" +
                     " INNER JOIN #{MemberRole.table_name} mr ON mr.member_id = m.id" +
                     " INNER JOIN #{table_name_prefix}custom_fields_roles#{table_name_suffix} cfr ON cfr.role_id = mr.role_id" +
                     " WHERE m.user_id = ?)",
                     true, user.id)
                 else
                   where(:visible => true)
                 end
               }
               def visible_by?(project, user=User.current)
                 visible? || user.admin?
               end
               safe_attributes 'name',
                 'field_format',
                 'possible_values',
                 'regexp',
                 'min_lnegth',
                 'max_length',
                 'is_required',
                 'is_for_all',
                 'is_filter',
                 'position',
                 'searchable',
                 'default_value',
                 'editable',
                 'visible',
                 'multiple',
                 'description',
                 'role_ids',
                 'url_pattern',
                 'text_formatting',
                 'edit_tag_style',
                 'user_role',
                 'version_status'
               def format
                 @format ||= Redmine::FieldFormat.find(field_format)
               end
               def field_format=(arg)
                 # cannot change format of a saved custom field
                 if new_record?
                   @format = nil
                   super
                 end
               end
               def set_searchable
                 # make sure these fields are not searchable
                 self.searchable = false unless format.class.searchable_supported
                 # make sure only these fields can have multiple values
                 self.multiple = false unless format.class.multiple_supported
                 true
               end
               def validate_custom_field
                 format.validate_custom_field(self).each do |attribute, message|
                   errors.add attribute, message
                 end
                 if regexp.present?
                   begin
                     Regexp.new(regexp)
                   rescue
                     errors.add(:regexp, :invalid)
                   end
                 end
                 if default_value.present?
                   validate_field_value(default_value).each do |message|
                     errors.add :default_value, message
                   end
                 end
               end
               def possible_custom_value_options(custom_value)
                 format.possible_custom_value_options(custom_value)
               end
               def possible_values_options(object=nil)
                 if object.is_a?(Array)
                   object.map {|o| format.possible_values_options(self, o)}.reduce(:&) || []
                 else
                   format.possible_values_options(self, object) || []
                 end
               end
               def possible_values
                 values = read_attribute(:possible_values)
                 if values.is_a?(Array)
                   values.each do |value|
                     value.to_s.force_encoding('UTF-8')
                   end
                   values
                 else
                   []
                 end
               end
               # Makes possible_values accept a multiline string
               def possible_values=(arg)
                 if arg.is_a?(Array)
                   values = arg.compact.map {|a| a.to_s.strip}.reject(&:blank?)
                   write_attribute(:possible_values, values)
                 else
                   self.possible_values = arg.to_s.split(/[\n\r]+/)
                 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
               def value_from_keyword(keyword, customized)
                 format.value_from_keyword(self, keyword, customized)
               end
               # Returns the options hash used to build a query filter for the field
               def query_filter_options(query)
                 format.query_filter_options(self, query)
               end
               def totalable?
                 format.totalable_supported
               end
               # Returns a ORDER BY clause that can used to sort customized
               # objects by their value of the custom field.
               # Returns nil if the custom field can not be used for sorting.
               def order_statement
                 return nil if multiple?
                 format.order_statement(self)
               end
               # Returns a GROUP BY clause that can used to group by custom value
               # Returns nil if the custom field can not be used for grouping.
               def group_statement
                 return nil if multiple?
                 format.group_statement(self)
               end
               def join_for_order_statement
                 format.join_for_order_statement(self)
               end
               def visibility_by_project_condition(project_key=nil, user=User.current, id_column=nil)
                 if visible? || user.admin?
                   "1=1"
                 elsif user.anonymous?
                   "1=0"
                 else
                   project_key ||= "#{self.class.customized_class.table_name}.project_id"
                   id_column ||= id
                   "#{project_key} IN (SELECT DISTINCT m.project_id FROM #{Member.table_name} m" +
                     " INNER JOIN #{MemberRole.table_name} mr ON mr.member_id = m.id" +
                     " INNER JOIN #{table_name_prefix}custom_fields_roles#{table_name_suffix} cfr ON cfr.role_id = mr.role_id" +
                     " WHERE m.user_id = #{user.id} AND cfr.custom_field_id = #{id_column})"
                 end
               end
               def self.visibility_condition
                 if user.admin?
                   "1=1"
                 elsif user.anonymous?
                   "#{table_name}.visible"
                 else
                   "#{project_key} IN (SELECT DISTINCT m.project_id FROM #{Member.table_name} m" +
                     " INNER JOIN #{MemberRole.table_name} mr ON mr.member_id = m.id" +
                     " INNER JOIN #{table_name_prefix}custom_fields_roles#{table_name_suffix} cfr ON cfr.role_id = mr.role_id" +
                     " WHERE m.user_id = #{user.id} AND cfr.custom_field_id = #{id})"
                 end
               end
               def <=>(field)
                 position <=> field.position
               end
               # Returns the class that values represent
               def value_class
                 format.target_class if format.respond_to?(:target_class)
               end
               def self.customized_class
                 self.name =~ /^(.+)CustomField$/
                 $1.constantize rescue nil
               end
               # to move in project_custom_field
               def self.for_all
                 where(:is_for_all => true).order('position').to_a
               end
               def type_name
                 nil
               end
               # Returns the error messages for the given value
               # 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
               # Returns the error messages for the default custom field value
               def validate_field_value(value)
                 validate_custom_value(CustomFieldValue.new(:custom_field => self, :value => value))
               end
               # Returns true if value is a valid value for the custom field
               def valid_field_value?(value)
                 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
               def self.human_attribute_name(attribute_key_name, *args)
                 attr_name = attribute_key_name.to_s
                 if attr_name == 'url_pattern'
                   attr_name = "url"
                 end
                 super(attr_name, *args)
               end
               protected
               # Removes multiple values for the custom field after setting the multiple attribute to false
               # We kepp the value with the highest id for each customized object
               def handle_multiplicity_change
                 if !new_record? && multiple_was && !multiple
                   ids = custom_values.
                     where("EXISTS(SELECT 1 FROM #{CustomValue.table_name} cve WHERE cve.custom_field_id = #{CustomValue.table_name}.custom_field_id" +
                       " AND cve.customized_type = #{CustomValue.table_name}.customized_type AND cve.customized_id = #{CustomValue.table_name}.customized_id" +
                       " AND cve.id > #{CustomValue.table_name}.id)").
                     pluck(:id)
                   if ids.any?
                     custom_values.where(:id => ids).delete_all
                   end
                 end
               end
             end
             require_dependency 'redmine/field_format'

app/models/custom_field_value.rb +4 0

             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class CustomFieldValue
               attr_accessor :custom_field, :customized, :value, :value_was
               def initialize(attributes={})
                 attributes.each do |name, v|
                   send "#{name}=", v
                 end
               end
               def custom_field_id
                 custom_field.id
               end
               def true?
                 self.value == '1'
               end
               def editable?
                 custom_field.editable?
               end
               def visible?
                 custom_field.visible?
               end
               def required?
                 custom_field.is_required?
               end
               def to_s
                 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)
                 end
               end
             end

app/models/custom_value.rb +12 0

             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class CustomValue < ActiveRecord::Base
               belongs_to :custom_field
               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)
                   self.value ||= custom_field.default_value
                 end
               end
               # Returns true if the boolean custom value is true
               def true?
                 self.value == '1'
               end
               def editable?
                 custom_field.editable?
               end
               def visible?
                 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,31 +1,47
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 %>
30	<%= javascript_include_tag 'attachments' %>	46	<%= javascript_include_tag 'attachments' %>
31	<% end %>	47	<% end %>

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

             var fileSpan = $('#attachments_<%= j params[:attachment_id] %>');
             <% if @attachment.new_record? %>
               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,
                 "data-method": 'delete',
                 href: '<%= j attachment_path(@attachment, :attachment_id => params[:attachment_id], :format => 'js') %>'
               })
               .off('click');
             <% end %>

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

             <%= error_messages_for 'custom_field' %>
             <div class="splitcontentleft">
             <div class="box tabular">
             <p><%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :disabled => !@custom_field.new_record? %></p>
             <p><%= f.text_field :name, :size => 50, :required => true %></p>
             <p><%= f.text_area :description, :rows => 7 %></p>
             <% if @custom_field.format.multiple_supported %>
             <p>
               <%= f.check_box :multiple %>
               <% if !@custom_field.new_record? && @custom_field.multiple %>
               <em class="info"><%= l(:text_turning_multiple_off) %></em>
               <% end %>
             </p>
             <% end %>
             <%= render_custom_field_format_partial f, @custom_field %>
             <%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %>
             </div>
             <p><%= submit_tag l(:button_save) %></p>
             </div>
             <div class="splitcontentright">
             <div class="box tabular">
             <% case @custom_field.class.name
             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>
                   <label><%= l(:field_visible) %></label>
                   <label class="block">
                     <%= radio_button_tag 'custom_field[visible]', 1, @custom_field.visible?, :id => 'custom_field_visible_on',
                           :data => {:disables => '.custom_field_role input'} %>
                     <%= l(:label_visibility_public) %>
                   </label>
                   <label class="block">
                     <%= radio_button_tag 'custom_field[visible]', 0, !@custom_field.visible?, :id => 'custom_field_visible_off',
                           :data => {:enables => '.custom_field_role input'} %>
                     <%= l(:label_visibility_roles) %>:
                   </label>
                   <% Role.givable.sorted.each do |role| %>
                     <label class="block custom_field_role" style="padding-left:2em;">
                       <%= check_box_tag 'custom_field[role_ids][]', role.id, @custom_field.roles.include?(role), :id => nil %>
                       <%= role.name %>
                     </label>
                   <% end %>
                   <%= hidden_field_tag 'custom_field[role_ids][]', '' %>
                 </p>
             <% when "UserCustomField" %>
                 <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>
                 <p><%= f.check_box :visible %></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>
             <% end %>
             <%= call_hook(:"view_custom_fields_form_#{@custom_field.type.to_s.underscore}", :custom_field => @custom_field, :form => f) %>
             </div>
             <% if @custom_field.is_a?(IssueCustomField) %>
               <fieldset class="box" id="custom_field_tracker_ids"><legend><%=l(:label_tracker_plural)%></legend>
               <% Tracker.sorted.each do |tracker| %>
                 <%= check_box_tag "custom_field[tracker_ids][]",
                                   tracker.id,
                                   (@custom_field.trackers.include? tracker),
                                   :id => "custom_field_tracker_ids_#{tracker.id}" %>
                 <label class="no-css" for="custom_field_tracker_ids_<%=tracker.id%>">
                   <%= tracker.name %>
                 </label>
               <% end %>
               <%= hidden_field_tag "custom_field[tracker_ids][]", '' %>
               <p><%= check_all_links 'custom_field_tracker_ids' %></p>
               </fieldset>
               <fieldset class="box" id="custom_field_project_ids"><legend><%= l(:label_project_plural) %></legend>
                 <% project_ids = @custom_field.project_ids.to_a %>
                 <%= render_project_nested_lists(Project.all) do |p|
                   content_tag('label', check_box_tag('custom_field[project_ids][]', p.id, project_ids.include?(p.id), :id => nil) + ' ' + p)
                 end %>
                 <%= hidden_field_tag('custom_field[project_ids][]', '', :id => nil) %>
                 <p><%= check_all_links 'custom_field_project_ids' %></p>
               </fieldset>
             <% end %>
             </div>
             <% include_calendar_headers_tags %>

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

             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module Redmine
               module Acts
                 module Attachable
                   def self.included(base)
                     base.extend ClassMethods
                   end
                   module ClassMethods
                     def acts_as_attachable(options = {})
                       cattr_accessor :attachable_options
                       self.attachable_options = {}
                       attachable_options[:view_permission] = options.delete(:view_permission) || "view_#{self.name.pluralize.underscore}".to_sym
                       attachable_options[:edit_permission] = options.delete(:edit_permission) || "edit_#{self.name.pluralize.underscore}".to_sym
                       attachable_options[:delete_permission] = options.delete(:delete_permission) || "edit_#{self.name.pluralize.underscore}".to_sym
                       has_many :attachments, lambda {order("#{Attachment.table_name}.created_on ASC, #{Attachment.table_name}.id ASC")},
                                              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
                   module InstanceMethods
                     def self.included(base)
                       base.extend ClassMethods
                     end
                     def attachments_visible?(user=User.current)
                       (respond_to?(:visible?) ? visible?(user) : true) &&
                         user.allowed_to?(self.class.attachable_options[:view_permission], self.project)
                     end
                     def attachments_editable?(user=User.current)
                       (respond_to?(:visible?) ? visible?(user) : true) &&
                         user.allowed_to?(self.class.attachable_options[:edit_permission], self.project)
                     end
                     def attachments_deletable?(user=User.current)
                       (respond_to?(:visible?) ? visible?(user) : true) &&
                         user.allowed_to?(self.class.attachable_options[:delete_permission], self.project)
                     end
                     def saved_attachments
                       @saved_attachments ||= []
                     end
                     def unsaved_attachments
                       @unsaved_attachments ||= []
                     end
                     def save_attachments(attachments, author=User.current)
                       if attachments.is_a?(Hash)
                         attachments = attachments.stringify_keys
                         attachments = attachments.to_a.sort {|a, b|
                           if a.first.to_i > 0 && b.first.to_i > 0
                             a.first.to_i <=> b.first.to_i
                           elsif a.first.to_i > 0
                           elsif b.first.to_i > 0
                             -1
                           else
                             a.first <=> b.first
                           end
                         }
                         attachments = attachments.map(&:last)
                       end
                       if attachments.is_a?(Array)
                         @failed_attachment_count = 0
                         attachments.each do |attachment|
                           next unless attachment.is_a?(Hash)
                           a = nil
                           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
                               next
                             end
                             a.filename = attachment['filename'] unless attachment['filename'].blank?
                             a.content_type = attachment['content_type'] unless attachment['content_type'].blank?
                           end
                           next unless a
                           a.description = attachment['description'].to_s.strip
                           if a.new_record?
                             unsaved_attachments << a
                           else
                             saved_attachments << a
                           end
                         end
                       end
                       {:files => saved_attachments, :unsaved => unsaved_attachments}
                     end
                     def attach_saved_attachments
                       saved_attachments.each do |attachment|
                         self.attachments << attachment
                       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)
                       end
                     end
                     module ClassMethods
                     end
                   end
                 end
               end
             end

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

             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module Redmine
               module Acts
                 module Customizable
                   def self.included(base)
                     base.extend ClassMethods
                   end
                   module ClassMethods
                     def acts_as_customizable(options = {})
                       return if self.included_modules.include?(Redmine::Acts::Customizable::InstanceMethods)
                       cattr_accessor :customizable_options
                       self.customizable_options = options
                       has_many :custom_values, lambda {includes(:custom_field).order("#{CustomField.table_name}.position")},
                                                :as => :customized,
                                                :dependent => :delete_all,
                                                :validate => false
                       send :include, Redmine::Acts::Customizable::InstanceMethods
                       validate :validate_custom_field_values
                       after_save :save_custom_field_values
                     end
                   end
                   module InstanceMethods
                     def self.included(base)
                       base.extend ClassMethods
                     end
                     def available_custom_fields
                       CustomField.where("type = '#{self.class.name}CustomField'").sorted.to_a
                     end
                     # Sets the values of the object's custom fields
                     # values is an array like [{'id' => 1, 'value' => 'foo'}, {'id' => 2, 'value' => 'bar'}]
                     def custom_fields=(values)
                       values_to_hash = values.inject({}) do |hash, v|
                         v = v.stringify_keys
                         if v['id'] && v.has_key?('value')
                           hash[v['id']] = v['value']
                         end
                         hash
                       end
                       self.custom_field_values = values_to_hash
                     end
                     # Sets the values of the object's custom fields
                     # values is a hash like {'1' => 'foo', 2 => 'bar'}
                     def custom_field_values=(values)
                       values = values.stringify_keys
                       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
                     end
                     def custom_field_values
                       @custom_field_values ||= available_custom_fields.collect do |field|
                         x = CustomFieldValue.new
                         x.custom_field = field
                         x.customized = self
                         if field.multiple?
                           values = custom_values.select { |v| v.custom_field == field }
                           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
                       end
                     end
                     def visible_custom_field_values
                       custom_field_values.select(&:visible?)
                     end
                     def custom_field_values_changed?
                       @custom_field_values_changed == true
                     end
                     def custom_value_for(c)
                       field_id = (c.is_a?(CustomField) ? c.id : c.to_i)
                       custom_values.detect {|v| v.custom_field_id == field_id }
                     end
                     def custom_field_value(c)
                       field_id = (c.is_a?(CustomField) ? c.id : c.to_i)
                       custom_field_values.detect {|v| v.custom_field_id == field_id }.try(:value)
                     end
                     def validate_custom_field_values
                       if new_record? || custom_field_values_changed?
                         custom_field_values.each(&:validate_value)
                       end
                     end
                     def save_custom_field_values
                       target_custom_values = []
                       custom_field_values.each do |custom_field_value|
                         if custom_field_value.value.is_a?(Array)
                           custom_field_value.value.each do |v|
                             target = custom_values.detect {|cv| cv.custom_field == custom_field_value.custom_field && cv.value == v}
                             target ||= custom_values.build(:customized => self, :custom_field => custom_field_value.custom_field, :value => v)
                             target_custom_values << target
                           end
                         else
                           target = custom_values.detect {|cv| cv.custom_field == custom_field_value.custom_field}
                           target ||= custom_values.build(:customized => self, :custom_field => custom_field_value.custom_field)
                           target.value = custom_field_value.value
                           target_custom_values << target
                         end
                       end
                       self.custom_values = target_custom_values
                       custom_values.each(&:save)
                       @custom_field_values_changed = false
                       true
                     end
                     def reassign_custom_field_values
                       if @custom_field_values
                         values = @custom_field_values.inject({}) {|h,v| h[v.custom_field_id] = v.value; h}
                         @custom_field_values = nil
                         self.custom_field_values = values
                       end
                     end
                     def reset_custom_values!
                       @custom_field_values = nil
                       @custom_field_values_changed = true
                     end
                     def reload(*args)
                       @custom_field_values = nil
                       @custom_field_values_changed = false
                       super
                     end
                     module ClassMethods
                     end
                   end
                 end
               end
             end

lib/redmine/field_format.rb +129 0

             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'uri'
             module Redmine
               module FieldFormat
                 def self.add(name, klass)
                   all[name.to_s] = klass.instance
                 end
                 def self.delete(name)
                   all.delete(name.to_s)
                 end
                 def self.all
                   @formats ||= Hash.new(Base.instance)
                 end
                 def self.available_formats
                   all.keys
                 end
                 def self.find(name)
                   all[name.to_s]
                 end
                 # Return an array of custom field formats which can be used in select_tag
                 def self.as_select(class_name=nil)
                   formats = all.values.select do |format|
                     format.class.customized_class_names.nil? || format.class.customized_class_names.include?(class_name)
                   end
                   formats.map {|format| [::I18n.t(format.label), format.name] }.sort_by(&:first)
                 end
                 # Returns an array of formats that can be used for a custom field class
                 def self.formats_for_custom_field_class(klass=nil)
                   all.values.select do |format|
                     format.class.customized_class_names.nil? || format.class.customized_class_names.include?(klass.name)
                   end
                 end
                 class Base
                   include Singleton
                   include Redmine::I18n
                   include Redmine::Helpers::URL
                   include ERB::Util
                   class_attribute :format_name
                   self.format_name = nil
                   # Set this to true if the format supports multiple values
                   class_attribute :multiple_supported
                   self.multiple_supported = false
+                  # Set this to true if the format supports filtering on custom values
+                  class_attribute :is_filter_supported
+                  self.is_filter_supported = true
                   # Set this to true if the format supports textual search on custom values
                   class_attribute :searchable_supported
                   self.searchable_supported = false
                   # Set this to true if field values can be summed up
                   class_attribute :totalable_supported
                   self.totalable_supported = false
                   # Restricts the classes that the custom field can be added to
                   # Set to nil for no restrictions
                   class_attribute :customized_class_names
                   self.customized_class_names = nil
                   # Name of the partial for editing the custom field
                   class_attribute :form_partial
                   self.form_partial = nil
                   class_attribute :change_as_diff
                   self.change_as_diff = false
+                  class_attribute :change_no_details
+                  self.change_no_details = false
                   def self.add(name)
                     self.format_name = name
                     Redmine::FieldFormat.add(name, self)
                   end
                   private_class_method :add
                   def self.field_attributes(*args)
                     CustomField.store_accessor :format_store, *args
                   end
                   field_attributes :url_pattern
                   def name
                     self.class.format_name
                   end
                   def label
                     "label_#{name}"
                   end
+                  def set_custom_field_value(custom_field, custom_field_value, value)
+                    if value.is_a?(Array)
+                      value = value.map(&:to_s).reject{|v| v==''}.uniq
+                      if value.empty?
+                        value << ''
+                      end
+                    else
+                      value = value.to_s
+                    end
+                    value
+                  end
                   def cast_custom_value(custom_value)
                     cast_value(custom_value.custom_field, custom_value.value, custom_value.customized)
                   end
                   def cast_value(custom_field, value, customized=nil)
                     if value.blank?
                       nil
                     elsif value.is_a?(Array)
                       casted = value.map do |v|
                         cast_single_value(custom_field, v, customized)
                       end
                       casted.compact.sort
                     else
                       cast_single_value(custom_field, value, customized)
                     end
                   end
                   def cast_single_value(custom_field, value, customized=nil)
                     value.to_s
                   end
                   def target_class
                     nil
                   end
                   def possible_custom_value_options(custom_value)
                     possible_values_options(custom_value.custom_field, custom_value.customized)
                   end
                   def possible_values_options(custom_field, object=nil)
                     []
                   end
                   def value_from_keyword(custom_field, keyword, object)
                     possible_values_options = possible_values_options(custom_field, object)
                     if possible_values_options.present?
                       keyword = keyword.to_s
                       if v = possible_values_options.detect {|text, id| keyword.casecmp(text)  == 0}
                         if v.is_a?(Array)
                           v.last
                         else
                           v
                         end
                       end
                     else
                       keyword
                     end
                   end
                   # Returns the validation errors for custom_field
                   # Should return an empty array if custom_field is valid
                   def validate_custom_field(custom_field)
                     errors = []
                     pattern = custom_field.url_pattern
                     if pattern.present? && !uri_with_safe_scheme?(url_pattern_without_tokens(pattern))
                       errors << [:url_pattern, :invalid]
                     end
                     errors
                   end
                   # Returns the validation error messages for custom_value
                   # Should return an empty array if custom_value is valid
+                  # custom_value is a CustomFieldValue.
                   def validate_custom_value(custom_value)
                     values = Array.wrap(custom_value.value).reject {|value| value.to_s == ''}
                     errors = values.map do |value|
                       validate_single_value(custom_value.custom_field, value, custom_value.customized)
                     end
                     errors.flatten.uniq
                   end
                   def validate_single_value(custom_field, value, customized=nil)
                     []
                   end
+                  # CustomValue after_save callback
+                  def after_save_custom_value(custom_field, custom_value)
+                  end
                   def formatted_custom_value(view, custom_value, html=false)
                     formatted_value(view, custom_value.custom_field, custom_value.value, custom_value.customized, html)
                   end
                   def formatted_value(view, custom_field, value, customized=nil, html=false)
                     casted = cast_value(custom_field, value, customized)
                     if html && custom_field.url_pattern.present?
                       texts_and_urls = Array.wrap(casted).map do |single_value|
                         text = view.format_object(single_value, false).to_s
                         url = url_from_pattern(custom_field, single_value, customized)
                         [text, url]
                       end
                       links = texts_and_urls.sort_by(&:first).map {|text, url| view.link_to_if uri_with_safe_scheme?(url), text, url}
                       links.join(', ').html_safe
                     else
                       casted
                     end
                   end
                   # Returns an URL generated with the custom field URL pattern
                   # and variables substitution:
                   # %value% => the custom field value
                   # %id% => id of the customized object
                   # %project_id% => id of the project of the customized object if defined
                   # %project_identifier% => identifier of the project of the customized object if defined
                   # %m1%, %m2%... => capture groups matches of the custom field regexp if defined
                   def url_from_pattern(custom_field, value, customized)
                     url = custom_field.url_pattern.to_s.dup
                     url.gsub!('%value%') {URI.encode value.to_s}
                     url.gsub!('%id%') {URI.encode customized.id.to_s}
                     url.gsub!('%project_id%') {URI.encode (customized.respond_to?(:project) ? customized.project.try(:id) : nil).to_s}
                     url.gsub!('%project_identifier%') {URI.encode (customized.respond_to?(:project) ? customized.project.try(:identifier) : nil).to_s}
                     if custom_field.regexp.present?
                       url.gsub!(%r{%m(\d+)%}) do
                         m = $1.to_i
                         if matches ||= value.to_s.match(Regexp.new(custom_field.regexp))
                           URI.encode matches[m].to_s
                         end
                       end
                     end
                     url
                   end
                   protected :url_from_pattern
                   # Returns the URL pattern with substitution tokens removed,
                   # for validation purpose
                   def url_pattern_without_tokens(url_pattern)
                     url_pattern.to_s.gsub(/%(value|id|project_id|project_identifier|m\d+)%/, '')
                   end
                   protected :url_pattern_without_tokens
                   def edit_tag(view, tag_id, tag_name, custom_value, options={})
                     view.text_field_tag(tag_name, custom_value.value, options.merge(:id => tag_id))
                   end
                   def bulk_edit_tag(view, tag_id, tag_name, custom_field, objects, value, options={})
                     view.text_field_tag(tag_name, value, options.merge(:id => tag_id)) +
                       bulk_clear_tag(view, tag_id, tag_name, custom_field, value)
                   end
                   def bulk_clear_tag(view, tag_id, tag_name, custom_field, value)
                     if custom_field.is_required?
                       ''.html_safe
                     else
                       view.content_tag('label',
                         view.check_box_tag(tag_name, '__none__', (value == '__none__'), :id => nil, :data => {:disables => "##{tag_id}"}) + l(:button_clear),
                         :class => 'inline'
                       )
                     end
                   end
                   protected :bulk_clear_tag
                   def query_filter_options(custom_field, query)
                     {:type => :string}
                   end
                   def before_custom_field_save(custom_field)
                   end
                   # Returns a ORDER BY clause that can used to sort customized
                   # objects by their value of the custom field.
                   # Returns nil if the custom field can not be used for sorting.
                   def order_statement(custom_field)
                     # COALESCE is here to make sure that blank and NULL values are sorted equally
                     "COALESCE(#{join_alias custom_field}.value, '')"
                   end
                   # Returns a GROUP BY clause that can used to group by custom value
                   # Returns nil if the custom field can not be used for grouping.
                   def group_statement(custom_field)
                     nil
                   end
                   # Returns a JOIN clause that is added to the query when sorting by custom values
                   def join_for_order_statement(custom_field)
                     alias_name = join_alias(custom_field)
                     "LEFT OUTER JOIN #{CustomValue.table_name} #{alias_name}" +
                       " ON #{alias_name}.customized_type = '#{custom_field.class.customized_class.base_class.name}'" +
                       " AND #{alias_name}.customized_id = #{custom_field.class.customized_class.table_name}.id" +
                       " AND #{alias_name}.custom_field_id = #{custom_field.id}" +
                       " AND (#{custom_field.visibility_by_project_condition})" +
                       " AND #{alias_name}.value <> ''" +
                       " AND #{alias_name}.id = (SELECT max(#{alias_name}_2.id) FROM #{CustomValue.table_name} #{alias_name}_2" +
                         " WHERE #{alias_name}_2.customized_type = #{alias_name}.customized_type" +
                         " AND #{alias_name}_2.customized_id = #{alias_name}.customized_id" +
                         " AND #{alias_name}_2.custom_field_id = #{alias_name}.custom_field_id)"
                   end
                   def join_alias(custom_field)
                     "cf_#{custom_field.id}"
                   end
                   protected :join_alias
                 end
                 class Unbounded < Base
                   def validate_single_value(custom_field, value, customized=nil)
                     errs = super
                     value = value.to_s
                     unless custom_field.regexp.blank? or value =~ Regexp.new(custom_field.regexp)
                       errs << ::I18n.t('activerecord.errors.messages.invalid')
                     end
                     if custom_field.min_length && value.length < custom_field.min_length
                       errs << ::I18n.t('activerecord.errors.messages.too_short', :count => custom_field.min_length)
                     end
                     if custom_field.max_length && custom_field.max_length > 0 && value.length > custom_field.max_length
                       errs << ::I18n.t('activerecord.errors.messages.too_long', :count => custom_field.max_length)
                     end
                     errs
                   end
                 end
                 class StringFormat < Unbounded
                   add 'string'
                   self.searchable_supported = true
                   self.form_partial = 'custom_fields/formats/string'
                   field_attributes :text_formatting
                   def formatted_value(view, custom_field, value, customized=nil, html=false)
                     if html
                       if custom_field.url_pattern.present?
                         super
                       elsif custom_field.text_formatting == 'full'
                         view.textilizable(value, :object => customized)
                       else
                         value.to_s
                       end
                     else
                       value.to_s
                     end
                   end
                 end
                 class TextFormat < Unbounded
                   add 'text'
                   self.searchable_supported = true
                   self.form_partial = 'custom_fields/formats/text'
                   self.change_as_diff = true
                   def formatted_value(view, custom_field, value, customized=nil, html=false)
                     if html
                       if value.present?
                         if custom_field.text_formatting == 'full'
                           view.textilizable(value, :object => customized)
                         else
                           view.simple_format(html_escape(value))
                         end
                       else
                         ''
                       end
                     else
                       value.to_s
                     end
                   end
                   def edit_tag(view, tag_id, tag_name, custom_value, options={})
                     view.text_area_tag(tag_name, custom_value.value, options.merge(:id => tag_id, :rows => 3))
                   end
                   def bulk_edit_tag(view, tag_id, tag_name, custom_field, objects, value, options={})
                     view.text_area_tag(tag_name, value, options.merge(:id => tag_id, :rows => 3)) +
                       '<br />'.html_safe +
                       bulk_clear_tag(view, tag_id, tag_name, custom_field, value)
                   end
                   def query_filter_options(custom_field, query)
                     {:type => :text}
                   end
                 end
                 class LinkFormat < StringFormat
                   add 'link'
                   self.searchable_supported = false
                   self.form_partial = 'custom_fields/formats/link'
                   def formatted_value(view, custom_field, value, customized=nil, html=false)
                     if html && value.present?
                       if custom_field.url_pattern.present?
                         url = url_from_pattern(custom_field, value, customized)
                       else
                         url = value.to_s
                         unless url =~ %r{\A[a-z]+://}i
                           # no protocol found, use http by default
                           url = "http://" + url
                         end
                       end
                       view.link_to value.to_s.truncate(40), url
                     else
                       value.to_s
                     end
                   end
                 end
                 class Numeric < Unbounded
                   self.form_partial = 'custom_fields/formats/numeric'
                   self.totalable_supported = true
                   def order_statement(custom_field)
                     # Make the database cast values into numeric
                     # Postgresql will raise an error if a value can not be casted!
                     # CustomValue validations should ensure that it doesn't occur
                     "CAST(CASE #{join_alias custom_field}.value WHEN '' THEN '0' ELSE #{join_alias custom_field}.value END AS decimal(30,3))"
                   end
                   # Returns totals for the given scope
                   def total_for_scope(custom_field, scope)
                     scope.joins(:custom_values).
                       where(:custom_values => {:custom_field_id => custom_field.id}).
                       where.not(:custom_values => {:value => ''}).
                       sum("CAST(#{CustomValue.table_name}.value AS decimal(30,3))")
                   end
                   def cast_total_value(custom_field, value)
                     cast_single_value(custom_field, value)
                   end
                 end
                 class IntFormat < Numeric
                   add 'int'
                   def label
                     "label_integer"
                   end
                   def cast_single_value(custom_field, value, customized=nil)
                     value.to_i
                   end
                   def validate_single_value(custom_field, value, customized=nil)
                     errs = super
                     errs << ::I18n.t('activerecord.errors.messages.not_a_number') unless value.to_s =~ /^[+-]?\d+$/
                     errs
                   end
                   def query_filter_options(custom_field, query)
                     {:type => :integer}
                   end
                   def group_statement(custom_field)
                     order_statement(custom_field)
                   end
                 end
                 class FloatFormat < Numeric
                   add 'float'
                   def cast_single_value(custom_field, value, customized=nil)
                     value.to_f
                   end
                   def cast_total_value(custom_field, value)
                     value.to_f.round(2)
                   end
                   def validate_single_value(custom_field, value, customized=nil)
                     errs = super
                     errs << ::I18n.t('activerecord.errors.messages.invalid') unless (Kernel.Float(value) rescue nil)
                     errs
                   end
                   def query_filter_options(custom_field, query)
                     {:type => :float}
                   end
                 end
                 class DateFormat < Unbounded
                   add 'date'
                   self.form_partial = 'custom_fields/formats/date'
                   def cast_single_value(custom_field, value, customized=nil)
                     value.to_date rescue nil
                   end
                   def validate_single_value(custom_field, value, customized=nil)
                     if value =~ /^\d{4}-\d{2}-\d{2}$/ && (value.to_date rescue false)
                       []
                     else
                       [::I18n.t('activerecord.errors.messages.not_a_date')]
                     end
                   end
                   def edit_tag(view, tag_id, tag_name, custom_value, options={})
                     view.date_field_tag(tag_name, custom_value.value, options.merge(:id => tag_id, :size => 10)) +
                       view.calendar_for(tag_id)
                   end
                   def bulk_edit_tag(view, tag_id, tag_name, custom_field, objects, value, options={})
                     view.date_field_tag(tag_name, value, options.merge(:id => tag_id, :size => 10)) +
                       view.calendar_for(tag_id) +
                       bulk_clear_tag(view, tag_id, tag_name, custom_field, value)
                   end
                   def query_filter_options(custom_field, query)
                     {:type => :date}
                   end
                   def group_statement(custom_field)
                     order_statement(custom_field)
                   end
                 end
                 class List < Base
                   self.multiple_supported = true
                   field_attributes :edit_tag_style
                   def edit_tag(view, tag_id, tag_name, custom_value, options={})
                     if custom_value.custom_field.edit_tag_style == 'check_box'
                       check_box_edit_tag(view, tag_id, tag_name, custom_value, options)
                     else
                       select_edit_tag(view, tag_id, tag_name, custom_value, options)
                     end
                   end
                   def bulk_edit_tag(view, tag_id, tag_name, custom_field, objects, value, options={})
                     opts = []
                     opts << [l(:label_no_change_option), ''] unless custom_field.multiple?
                     opts << [l(:label_none), '__none__'] unless custom_field.is_required?
                     opts += possible_values_options(custom_field, objects)
                     view.select_tag(tag_name, view.options_for_select(opts, value), options.merge(:multiple => custom_field.multiple?))
                   end
                   def query_filter_options(custom_field, query)
                     {:type => :list_optional, :values => query_filter_values(custom_field, query)}
                   end
                   protected
                   # Returns the values that are available in the field filter
                   def query_filter_values(custom_field, query)
                     possible_values_options(custom_field, query.project)
                   end
                   # Renders the edit tag as a select tag
                   def select_edit_tag(view, tag_id, tag_name, custom_value, options={})
                     blank_option = ''.html_safe
                     unless custom_value.custom_field.multiple?
                       if custom_value.custom_field.is_required?
                         unless custom_value.custom_field.default_value.present?
                           blank_option = view.content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---", :value => '')
                         end
                       else
                         blank_option = view.content_tag('option', '&nbsp;'.html_safe, :value => '')
                       end
                     end
                     options_tags = blank_option + view.options_for_select(possible_custom_value_options(custom_value), custom_value.value)
                     s = view.select_tag(tag_name, options_tags, options.merge(:id => tag_id, :multiple => custom_value.custom_field.multiple?))
                     if custom_value.custom_field.multiple?
                       s << view.hidden_field_tag(tag_name, '')
                     end
                     s
                   end
                   # Renders the edit tag as check box or radio tags
                   def check_box_edit_tag(view, tag_id, tag_name, custom_value, options={})
                     opts = []
                     unless custom_value.custom_field.multiple? || custom_value.custom_field.is_required?
                       opts << ["(#{l(:label_none)})", '']
                     end
                     opts += possible_custom_value_options(custom_value)
                     s = ''.html_safe
                     tag_method = custom_value.custom_field.multiple? ? :check_box_tag : :radio_button_tag
                     opts.each do |label, value|
                       value ||= label
                       checked = (custom_value.value.is_a?(Array) && custom_value.value.include?(value)) || custom_value.value.to_s == value
                       tag = view.send(tag_method, tag_name, value, checked, :id => tag_id)
                       # set the id on the first tag only
                       tag_id = nil
                       s << view.content_tag('label', tag + ' ' + label)
                     end
                     if custom_value.custom_field.multiple?
                       s << view.hidden_field_tag(tag_name, '')
                     end
                     css = "#{options[:class]} check_box_group"
                     view.content_tag('span', s, options.merge(:class => css))
                   end
                 end
                 class ListFormat < List
                   add 'list'
                   self.searchable_supported = true
                   self.form_partial = 'custom_fields/formats/list'
                   def possible_custom_value_options(custom_value)
                     options = possible_values_options(custom_value.custom_field)
                     missing = [custom_value.value].flatten.reject(&:blank?) - options
                     if missing.any?
                       options += missing
                     end
                     options
                   end
                   def possible_values_options(custom_field, object=nil)
                     custom_field.possible_values
                   end
                   def validate_custom_field(custom_field)
                     errors = []
                     errors << [:possible_values, :blank] if custom_field.possible_values.blank?
                     errors << [:possible_values, :invalid] unless custom_field.possible_values.is_a? Array
                     errors
                   end
                   def validate_custom_value(custom_value)
                     values = Array.wrap(custom_value.value).reject {|value| value.to_s == ''}
                     invalid_values = values - Array.wrap(custom_value.value_was) - custom_value.custom_field.possible_values
                     if invalid_values.any?
                       [::I18n.t('activerecord.errors.messages.inclusion')]
                     else
                       []
                     end
                   end
                   def group_statement(custom_field)
                     order_statement(custom_field)
                   end
                 end
                 class BoolFormat < List
                   add 'bool'
                   self.multiple_supported = false
                   self.form_partial = 'custom_fields/formats/bool'
                   def label
                     "label_boolean"
                   end
                   def cast_single_value(custom_field, value, customized=nil)
                     value == '1' ? true : false
                   end
                   def possible_values_options(custom_field, object=nil)
                     [[::I18n.t(:general_text_Yes), '1'], [::I18n.t(:general_text_No), '0']]
                   end
                   def group_statement(custom_field)
                     order_statement(custom_field)
                   end
                   def edit_tag(view, tag_id, tag_name, custom_value, options={})
                     case custom_value.custom_field.edit_tag_style
                     when 'check_box'
                       single_check_box_edit_tag(view, tag_id, tag_name, custom_value, options)
                     when 'radio'
                       check_box_edit_tag(view, tag_id, tag_name, custom_value, options)
                     else
                       select_edit_tag(view, tag_id, tag_name, custom_value, options)
                     end
                   end
                   # Renders the edit tag as a simple check box
                   def single_check_box_edit_tag(view, tag_id, tag_name, custom_value, options={})
                     s = ''.html_safe
                     s << view.hidden_field_tag(tag_name, '0', :id => nil)
                     s << view.check_box_tag(tag_name, '1', custom_value.value.to_s == '1', :id => tag_id)
                     view.content_tag('span', s, options)
                   end
                 end
                 class RecordList < List
                   self.customized_class_names = %w(Issue TimeEntry Version Document Project)
                   def cast_single_value(custom_field, value, customized=nil)
                     target_class.find_by_id(value.to_i) if value.present?
                   end
                   def target_class
                     @target_class ||= self.class.name[/^(.*::)?(.+)Format$/, 2].constantize rescue nil
                   end
                   def reset_target_class
                     @target_class = nil
                   end
                   def possible_custom_value_options(custom_value)
                     options = possible_values_options(custom_value.custom_field, custom_value.customized)
                     missing = [custom_value.value_was].flatten.reject(&:blank?) - options.map(&:last)
                     if missing.any?
                       options += target_class.where(:id => missing.map(&:to_i)).map {|o| [o.to_s, o.id.to_s]}
                     end
                     options
                   end
                   def order_statement(custom_field)
                     if target_class.respond_to?(:fields_for_order_statement)
                       target_class.fields_for_order_statement(value_join_alias(custom_field))
                     end
                   end
                   def group_statement(custom_field)
                     "COALESCE(#{join_alias custom_field}.value, '')"
                   end
                   def join_for_order_statement(custom_field)
                     alias_name = join_alias(custom_field)
                     "LEFT OUTER JOIN #{CustomValue.table_name} #{alias_name}" +
                       " ON #{alias_name}.customized_type = '#{custom_field.class.customized_class.base_class.name}'" +
                       " AND #{alias_name}.customized_id = #{custom_field.class.customized_class.table_name}.id" +
                       " AND #{alias_name}.custom_field_id = #{custom_field.id}" +
                       " AND (#{custom_field.visibility_by_project_condition})" +
                       " AND #{alias_name}.value <> ''" +
                       " AND #{alias_name}.id = (SELECT max(#{alias_name}_2.id) FROM #{CustomValue.table_name} #{alias_name}_2" +
                         " WHERE #{alias_name}_2.customized_type = #{alias_name}.customized_type" +
                         " AND #{alias_name}_2.customized_id = #{alias_name}.customized_id" +
                         " AND #{alias_name}_2.custom_field_id = #{alias_name}.custom_field_id)" +
                       " LEFT OUTER JOIN #{target_class.table_name} #{value_join_alias custom_field}" +
                       " ON CAST(CASE #{alias_name}.value WHEN '' THEN '0' ELSE #{alias_name}.value END AS decimal(30,0)) = #{value_join_alias custom_field}.id"
                   end
                   def value_join_alias(custom_field)
                     join_alias(custom_field) + "_" + custom_field.field_format
                   end
                   protected :value_join_alias
                 end
                 class EnumerationFormat < RecordList
                   add 'enumeration'
                   self.form_partial = 'custom_fields/formats/enumeration'
                   def label
                     "label_field_format_enumeration"
                   end
                   def target_class
                     @target_class ||= CustomFieldEnumeration
                   end
                   def possible_values_options(custom_field, object=nil)
                     possible_values_records(custom_field, object).map {|u| [u.name, u.id.to_s]}
                   end
                   def possible_values_records(custom_field, object=nil)
                     custom_field.enumerations.active
                   end
                   def value_from_keyword(custom_field, keyword, object)
                     value = custom_field.enumerations.where("LOWER(name) LIKE LOWER(?)", keyword).first
                     value ? value.id : nil
                   end
                 end
                 class UserFormat < RecordList
                   add 'user'
                   self.form_partial = 'custom_fields/formats/user'
                   field_attributes :user_role
                   def possible_values_options(custom_field, object=nil)
                     possible_values_records(custom_field, object).map {|u| [u.name, u.id.to_s]}
                   end
                   def possible_values_records(custom_field, object=nil)
                     if object.is_a?(Array)
                       projects = object.map {|o| o.respond_to?(:project) ? o.project : nil}.compact.uniq
                       projects.map {|project| possible_values_records(custom_field, project)}.reduce(:&) || []
                     elsif object.respond_to?(:project) && object.project
                       scope = object.project.users
                       if custom_field.user_role.is_a?(Array)
                         role_ids = custom_field.user_role.map(&:to_s).reject(&:blank?).map(&:to_i)
                         if role_ids.any?
                           scope = scope.where("#{Member.table_name}.id IN (SELECT DISTINCT member_id FROM #{MemberRole.table_name} WHERE role_id IN (?))", role_ids)
                         end
                       end
                       scope.sorted
                     else
                       []
                     end
                   end
                   def value_from_keyword(custom_field, keyword, object)
                     users = possible_values_records(custom_field, object).to_a
                     user = Principal.detect_by_keyword(users, keyword)
                     user ? user.id : nil
                   end
                   def before_custom_field_save(custom_field)
                     super
                     if custom_field.user_role.is_a?(Array)
                       custom_field.user_role.map!(&:to_s).reject!(&:blank?)
                     end
                   end
                 end
                 class VersionFormat < RecordList
                   add 'version'
                   self.form_partial = 'custom_fields/formats/version'
                   field_attributes :version_status
                   def possible_values_options(custom_field, object=nil)
                     versions_options(custom_field, object)
                   end
                   def before_custom_field_save(custom_field)
                     super
                     if custom_field.version_status.is_a?(Array)
                       custom_field.version_status.map!(&:to_s).reject!(&:blank?)
                     end
                   end
                   protected
                   def query_filter_values(custom_field, query)
                     versions_options(custom_field, query.project, true)
                   end
                   def versions_options(custom_field, object, all_statuses=false)
                     if object.is_a?(Array)
                       projects = object.map {|o| o.respond_to?(:project) ? o.project : nil}.compact.uniq
                       projects.map {|project| possible_values_options(custom_field, project)}.reduce(:&) || []
                     elsif object.respond_to?(:project) && object.project
                       scope = object.project.shared_versions
                       filtered_versions_options(custom_field, scope, all_statuses)
                     elsif object.nil?
                       scope = ::Version.visible.where(:sharing => 'system')
                       filtered_versions_options(custom_field, scope, all_statuses)
                     else
                       []
                     end
                   end
                   def filtered_versions_options(custom_field, scope, all_statuses=false)
                     if !all_statuses && custom_field.version_status.is_a?(Array)
                       statuses = custom_field.version_status.map(&:to_s).reject(&:blank?)
                       if statuses.any?
                         scope = scope.where(:status => statuses.map(&:to_s))
                       end
                     end
                     scope.sort.collect{|u| [u.to_s, u.id.to_s] }
                   end
                 end
+                class AttachementFormat < Base
+                  add 'attachment'
+                  self.form_partial = 'custom_fields/formats/attachment'
+                  self.is_filter_supported = false
+                  self.change_no_details = true
+                  def set_custom_field_value(custom_field, custom_field_value, value)
+                    attachment_present = false
+                    if value.is_a?(Hash)
+                      attachment_present = true
+                      value = value.except(:blank)
+                      if value.values.any? && value.values.all? {|v| v.is_a?(Hash)}
+                        value = value.values.first
+                      end
+                      if value.key?(:id)
+                        value = set_custom_field_value_by_id(custom_field, custom_field_value, value[:id])
+                      elsif value[:token].present?
+                        if attachment = Attachment.find_by_token(value[:token])
+                          value = attachment.id.to_s
+                        else
+                          value = ''
+                        end
+                      elsif value.key?(:file)
+                        attachment = Attachment.new(:file => value[:file], :author => User.current)
+                        if attachment.save
+                          value = attachment.id.to_s
+                        else
+                          value = ''
+                        end
+                      else
+                        attachment_present = false
+                        value = ''
+                      end
+                    elsif value.is_a?(String)
+                      value = set_custom_field_value_by_id(custom_field, custom_field_value, value)
+                    end
+                    custom_field_value.instance_variable_set "@attachment_present", attachment_present
+                    value
+                  end
+                  def set_custom_field_value_by_id(custom_field, custom_field_value, id)
+                    attachment = Attachment.find_by_id(id)
+                    if attachment && attachment.container.is_a?(CustomValue) && attachment.container.customized == custom_field_value.customized
+                      id.to_s
+                    else
+                      ''
+                    end
+                  end
+                  private :set_custom_field_value_by_id
+                  def cast_single_value(custom_field, value, customized=nil)
+                    Attachment.find_by_id(value.to_i) if value.present? && value.respond_to?(:to_i)
+                  end
+                  def validate_custom_value(custom_value)
+                    errors = []
+                    if custom_value.instance_variable_get("@attachment_present") && custom_value.value.blank?
+                      errors << ::I18n.t('activerecord.errors.messages.invalid')
+                    end
+                    errors.uniq
+                  end
+                  def after_save_custom_value(custom_field, custom_value)
+                    if custom_value.value_changed?
+                      if custom_value.value.present?
+                        attachment = Attachment.where(:id => custom_value.value.to_s).first
+                        if attachment
+                          attachment.container = custom_value
+                          attachment.save!
+                        end
+                      end
+                      if custom_value.value_was.present?
+                        attachment = Attachment.where(:id => custom_value.value_was.to_s).first
+                        if attachment
+                          attachment.destroy
+                        end
+                      end
+                    end
+                  end
+                  def edit_tag(view, tag_id, tag_name, custom_value, options={})
+                    attachment = nil
+                    if custom_value.value.present? #&& custom_value.value == custom_value.value_was
+                      attachment = Attachment.find_by_id(custom_value.value)
+                    end
+                    view.hidden_field_tag("#{tag_name}[blank]", "") +
+                      view.render(:partial => 'attachments/form',
+                        :locals => {
+                          :attachment_param => tag_name,
+                          :multiple => false,
+                          :description => false,
+                          :saved_attachments => [attachment].compact,
+                          :filedrop => false
+                        })
+                  end
+                end
               end
             end

public/javascripts/attachments.js +28 -13

             /* Redmine - project management software
                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;
             }
             addFile.nextAttachmentId = 1;
             function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
               function onLoadstart(e) {
                 fileSpan.removeClass('ajax-waiting');
                 fileSpan.addClass('ajax-loading');
                 $('input:submit', $(this).parents('form')).attr('disabled', 'disabled');
               }
               function onProgress(e) {
                 if(e.lengthComputable) {
                   this.progressbar( 'value', e.loaded * 100 / e.total );
                 }
               }
               function actualUpload(file, attachmentId, fileSpan, inputEl) {
                 ajaxUpload.uploading++;
                 uploadBlob(file, $(inputEl).data('upload-path'), attachmentId, {
                     loadstartEventHandler: onLoadstart.bind(progressSpan),
                     progressEventHandler: onProgress.bind(progressSpan)
                   })
                   .done(function(result) {
                     progressSpan.progressbar( 'value', 100 ).remove();
                     fileSpan.find('input.description, a').css('display', 'inline-block');
                   })
                   .fail(function(result) {
                     progressSpan.text(result.statusText);
                   }).always(function() {
                     ajaxUpload.uploading--;
                     fileSpan.removeClass('ajax-loading');
                     var form = fileSpan.parents('form');
                     if (form.queue('upload').length == 0 && ajaxUpload.uploading == 0) {
                       $('input:submit', form).removeAttr('disabled');
                     }
                     form.dequeue('upload');
                   });
               }
               var progressSpan = $('<div>').insertAfter(fileSpan.find('input.filename'));
               progressSpan.progressbar();
               fileSpan.addClass('ajax-waiting');
               var maxSyncUpload = $(inputEl).data('max-concurrent-uploads');
               if(maxSyncUpload == null || maxSyncUpload <= 0 || ajaxUpload.uploading < maxSyncUpload)
                 actualUpload(file, attachmentId, fileSpan, inputEl);
               else
                 $(inputEl).parents('form').queue('upload', actualUpload.bind(this, file, attachmentId, fileSpan, inputEl));
             }
             ajaxUpload.uploading = 0;
             function removeFile() {
               $(this).parent('span').remove();
               return false;
             }
             function uploadBlob(blob, uploadUrl, attachmentId, options) {
               var actualOptions = $.extend({
                 loadstartEventHandler: $.noop,
                 progressEventHandler: $.noop
               }, options);
               uploadUrl = uploadUrl + '?attachment_id=' + attachmentId;
               if (blob instanceof window.File) {
                 uploadUrl += '&filename=' + encodeURIComponent(blob.name);
                 uploadUrl += '&content_type=' + encodeURIComponent(blob.type);
               }
               return $.ajax(uploadUrl, {
                 type: 'POST',
                 contentType: 'application/octet-stream',
                 beforeSend: function(jqXhr, settings) {
                   jqXhr.setRequestHeader('Accept', 'application/js');
                   // attach proper File object
                   settings.data = blob;
                 },
                 xhr: function() {
                   var xhr = $.ajaxSettings.xhr();
                   xhr.upload.onloadstart = actualOptions.loadstartEventHandler;
                   xhr.upload.onprogress = actualOptions.progressEventHandler;
                   return xhr;
                 },
                 data: blob,
                 cache: false,
                 processData: false
               });
             }
             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 attachmentId;
                 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) {
               var maxFileSize = $(inputEl).data('max-file-size');
               var maxFileSizeExceeded = $(inputEl).data('max-file-size-message');
               var sizeExceeded = false;
               $.each(files, function() {
                 if (this.size && maxFileSize != null && this.size > parseInt(maxFileSize)) {sizeExceeded=true;}
               });
               if (sizeExceeded) {
                 window.alert(maxFileSizeExceeded);
               } else {
                 $.each(files, function() {addFile(inputEl, this, true);});
               }
+              return sizeExceeded;
             }
             function handleFileDropEvent(e) {
               $(this).removeClass('fileover');
               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());
               }
             }
             function dragOverHandler(e) {
               $(this).addClass('fileover');
               blockEventPropagation(e);
             }
             function dragOutHandler(e) {
               $(this).removeClass('fileover');
               blockEventPropagation(e);
             }
             function setupFileDrop() {
               if (window.File && window.FileList && window.ProgressEvent && window.FormData) {
                 $.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');
                 });
               }
             }
             $(document).ready(setupFileDrop);
             $(document).ready(function(){
               $("input.deleted_attachment").change(function(){
                 $(this).parents('.existing-attachment').toggleClass('deleted', $(this).is(":checked"));
               }).change();
             });

public/stylesheets/application.css +15 -11

             html {overflow-y:scroll;}
             body { font-family: Verdana, sans-serif; font-size: 12px; color:#333; margin: 0; padding: 0; min-width: 900px; }
             h1, h2, h3, h4 {font-family: "Trebuchet MS", Verdana, sans-serif;padding: 2px 10px 1px 0px;margin: 0 0 10px 0;}
             #content h1, h2, h3, h4 {color: #555;}
             h2, .wiki h1 {font-size: 20px;}
             h3, .wiki h2 {font-size: 16px;}
             h4, .wiki h3 {font-size: 13px;}
             h4 {border-bottom: 1px dotted #bbb;}
             pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;}
             /***** Layout *****/
             #wrapper {background: white;overflow: hidden;}
             #top-menu {background: #3E5B76; color: #fff; height:1.8em; font-size: 0.8em; padding: 2px 2px 0px 6px;}
             #top-menu ul {margin: 0;  padding: 0;}
             #top-menu li {
               float:left;
               list-style-type:none;
               margin: 0px 0px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
             }
             #top-menu a {color: #fff; margin-right: 8px; font-weight: bold;}
             #top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; }
             #account {float:right;}
             #header {min-height:5.3em;margin:0;background-color:#628DB6;color:#f8f8f8; padding: 4px 8px 20px 6px; position:relative;}
             #header a {color:#f8f8f8;}
             #header h1 { overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
             #header h1 .breadcrumbs { display:block; font-size: .5em; font-weight: normal; }
             #quick-search {float:right;}
             #main-menu {position: absolute;  bottom: 0px;  left:6px; margin-right: -500px; width: 100%;}
             #main-menu ul {margin: 0;  padding: 0; width: 100%; white-space: nowrap;}
             #main-menu li {
               float:none;
               list-style-type:none;
               margin: 0px 2px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
               display:inline-block;
             }
             #main-menu li a {
               display: block;
               color: #fff;
               text-decoration: none;
               font-weight: bold;
               margin: 0;
               padding: 4px 10px 4px 10px;
             }
             #main-menu li a:hover {background:#759FCF; color:#fff;}
             #main-menu li:hover ul.menu-children, #main-menu li ul.menu-children.visible {display: block;}
             #main-menu li a.selected, #main-menu li a.selected:hover {background:#fff; color:#555;}
             #main-menu li a.new-object { background-color:#759FCF; }
             #main-menu .menu-children {
               display: none;
               position:absolute;
               width: inherit;
               z-index:1;
               background-color:#fff;
               border-right: 1px solid #759FCF;
               border-bottom: 1px solid #759FCF;
               border-left: 1px solid #759FCF;
             }
             #main-menu .menu-children li {float:left; clear:both; width:100%;}
             #main-menu .menu-children li a {color: #555; background-color:#fff; font-weight:normal;}
             #main-menu .menu-children li a:hover {color: #fff; background-color: #759FCF;}
             #main-menu .tabs-buttons {
               right: 6px;
               background-color: transparent;
               border-bottom-color: transparent;
             }
             #admin-menu ul {margin: 0;  padding: 0;}
             #admin-menu li {margin: 0;  padding: 0 0 6px 0; list-style-type:none;}
             #admin-menu a { background-position: 0% 40%; background-repeat: no-repeat; padding-left: 20px; padding-top: 2px; padding-bottom: 3px;}
             #admin-menu a.projects { background-image: url(../images/projects.png); }
             #admin-menu a.users { background-image: url(../images/user.png); }
             #admin-menu a.groups { background-image: url(../images/group.png); }
             #admin-menu a.roles { background-image: url(../images/database_key.png); }
             #admin-menu a.trackers { background-image: url(../images/ticket.png); }
             #admin-menu a.issue_statuses { background-image: url(../images/ticket_edit.png); }
             #admin-menu a.workflows { background-image: url(../images/ticket_go.png); }
             #admin-menu a.custom_fields { background-image: url(../images/textfield.png); }
             #admin-menu a.enumerations { background-image: url(../images/text_list_bullets.png); }
             #admin-menu a.settings { background-image: url(../images/changeset.png); }
             #admin-menu a.plugins { background-image: url(../images/plugin.png); }
             #admin-menu a.info { background-image: url(../images/help.png); }
             #admin-menu a.server_authentication { background-image: url(../images/server_key.png); }
             #main {background-color:#EEEEEE;}
             #sidebar{ float: right; width: 22%; position: relative; z-index: 9; padding: 0; margin: 0;}
             * html #sidebar{ width: 22%; }
             #sidebar h3{ font-size: 14px; margin-top:14px; color: #666;  }
             #sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; }
             * html #sidebar hr{ width: 95%; position: relative; left: -6px; color: #ccc; }
             #sidebar .contextual { margin-right: 1em; }
             #sidebar ul, ul.flat {margin: 0;  padding: 0;}
             #sidebar ul li, ul.flat li {list-style-type:none;margin: 0px 2px 0px 0px; padding: 0px 0px 0px 0px;}
             #sidebar div.wiki ul {margin:inherit; padding-left:40px;}
             #sidebar div.wiki ul li {list-style-type:inherit;}
             #content { width: 75%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; }
             * html #content{ width: 75%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}
             html>body #content { min-height: 600px; }
             * html body #content { height: 600px; } /* IE */
             #main.nosidebar #sidebar{ display: none; }
             #main.nosidebar #content{ width: auto; border-right: 0; }
             #footer {clear: both; border-top: 1px solid #bbb; font-size: 0.9em; color: #aaa; padding: 5px; text-align:center; background:#fff;}
             #login-form {margin:5em auto 2em auto; padding:20px; width:340px; border:1px solid #FDBF3B; background-color:#FFEBC1; border-radius:4px; box-sizing: border-box;}
             #login-form label {display:block; margin-bottom:5px;}
             #login-form input[type=text], #login-form input[type=password] {border:1px solid #ccc; border-radius:3px; margin-bottom:15px; padding:7px; display:block; width:100%; box-sizing: border-box;}
             #login-form label {font-weight:bold;}
             #login-form label[for=autologin] {font-weight:normal;}
             #login-form a.lost_password {float:right; font-weight:normal;}
             #login-form input#openid_url {background:#fff url(../images/openid-bg.gif) no-repeat 4px 50%; padding-left:24px !important;}
             #login-form input#login-submit {margin-top:15px; padding:7px; display:block; width:100%; box-sizing: border-box;}
             div.modal { border-radius:5px; background:#fff; z-index:50; padding:4px;}
             div.modal h3.title {display:none;}
             div.modal p.buttons {text-align:right; margin-bottom:0;}
             div.modal .box p {margin: 0.3em 0;}
             .clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
             .mobile-show {display: none;}
             /***** Links *****/
             a, a:link, a:visited{ color: #169; text-decoration: none; }
             a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
             a img{ border: 0; }
             a.issue.closed, a.issue.closed:link, a.issue.closed:visited { color: #999; text-decoration: line-through; }
             a.project.closed, a.project.closed:link, a.project.closed:visited { color: #999; }
             a.user.locked, a.user.locked:link, a.user.locked:visited {color: #999;}
             #sidebar a.selected {line-height:1.7em; padding:1px 3px 2px 2px; margin-left:-2px; background-color:#9DB9D5; color:#fff; border-radius:2px;}
             #sidebar a.selected:hover {text-decoration:none;}
             #admin-menu a {line-height:1.7em;}
             #admin-menu a.selected {padding-left: 20px !important; background-position: 2px 40%;}
             a.collapsible {padding-left: 12px; background: url(../images/arrow_expanded.png) no-repeat -3px 40%;}
             a.collapsible.collapsed {background: url(../images/arrow_collapsed.png) no-repeat -5px 40%;}
             a#toggle-completed-versions {color:#999;}
             a.toggle-checkboxes { margin-left: 5px; padding-left: 12px; background: url(../images/toggle_check.png) no-repeat 0% 50%; }
             /***** Tables *****/
             table.list, .table-list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
             table.list th, .table-list-header { background-color:#EEEEEE; padding: 4px; white-space:nowrap; font-weight:bold; }
             table.list td {text-align:center; vertical-align:top; padding-right:10px;}
             table.list td.id { width: 2%; text-align: center;}
             table.list td.name, table.list td.description, table.list td.subject, table.list td.comments, table.list td.roles {text-align: left;}
             table.list td.tick {width:15%}
             table.list td.checkbox { width: 15px; padding: 2px 0 0 0; }
             table.list td.checkbox input {padding:0px;}
             table.list td.buttons, div.buttons { white-space:nowrap; text-align: right; }
             table.list td.buttons a, div.buttons a { margin-right: 0.6em; }
             table.list td.buttons img, div.buttons img {vertical-align:middle;}
             table.list td.reorder {width:15%; white-space:nowrap; text-align:center; }
             table.list table.progress td {padding-right:0px;}
             table.list caption { text-align: left; padding: 0.5em 0.5em 0.5em 0; }
             #role-permissions-trackers table.list th {white-space:normal;}
             .table-list-cell {display: table-cell; vertical-align: top; padding:2px; }
             tr.project td.name a { white-space:nowrap; }
             tr.project.closed, tr.project.archived { color: #aaa; }
             tr.project.closed a, tr.project.archived a { color: #aaa; }
             tr.project.idnt td.name span {background: url(../images/bullet_arrow_right.png) no-repeat 0 50%; padding-left: 16px;}
             tr.project.idnt-1 td.name {padding-left: 0.5em;}
             tr.project.idnt-2 td.name {padding-left: 2em;}
             tr.project.idnt-3 td.name {padding-left: 3.5em;}
             tr.project.idnt-4 td.name {padding-left: 5em;}
             tr.project.idnt-5 td.name {padding-left: 6.5em;}
             tr.project.idnt-6 td.name {padding-left: 8em;}
             tr.project.idnt-7 td.name {padding-left: 9.5em;}
             tr.project.idnt-8 td.name {padding-left: 11em;}
             tr.project.idnt-9 td.name {padding-left: 12.5em;}
             tr.issue { text-align: center; white-space: nowrap; }
             tr.issue td.subject, tr.issue td.category, td.assigned_to, tr.issue td.string, tr.issue td.text, tr.issue td.list, tr.issue td.relations, tr.issue td.parent { white-space: normal; }
             tr.issue td.relations { text-align: left; }
             tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
             tr.issue td.relations span {white-space: nowrap;}
             table.issues td.description {color:#777; font-size:90%; padding:4px 4px 4px 24px; text-align:left; white-space:normal;}
             table.issues td.description pre {white-space:normal;}
             tr.issue.idnt td.subject {background: url(../images/bullet_arrow_right.png) no-repeat 0 50%;}
             tr.issue.idnt-1 td.subject {padding-left: 24px; background-position: 8px 50%;}
             tr.issue.idnt-2 td.subject {padding-left: 40px; background-position: 24px 50%;}
             tr.issue.idnt-3 td.subject {padding-left: 56px; background-position: 40px 50%;}
             tr.issue.idnt-4 td.subject {padding-left: 72px; background-position: 56px 50%;}
             tr.issue.idnt-5 td.subject {padding-left: 88px; background-position: 72px 50%;}
             tr.issue.idnt-6 td.subject {padding-left: 104px; background-position: 88px 50%;}
             tr.issue.idnt-7 td.subject {padding-left: 120px; background-position: 104px 50%;}
             tr.issue.idnt-8 td.subject {padding-left: 136px; background-position: 120px 50%;}
             tr.issue.idnt-9 td.subject {padding-left: 152px; background-position: 136px 50%;}
             table.issue-report {table-layout:fixed;}
             tr.entry { border: 1px solid #f8f8f8; }
             tr.entry td { white-space: nowrap; }
             tr.entry td.filename {width:30%; text-align:left;}
             tr.entry td.filename_no_report {width:70%; text-align:left;}
             tr.entry td.size { text-align: right; font-size: 90%; }
             tr.entry td.revision, tr.entry td.author { text-align: center; }
             tr.entry td.age { text-align: right; }
             tr.entry.file td.filename a { margin-left: 16px; }
             tr.entry.file td.filename_no_report a { margin-left: 16px; }
             tr span.expander {background-image: url(../images/bullet_toggle_plus.png); padding-left: 8px; margin-left: 0; cursor: pointer;}
             tr.open span.expander {background-image: url(../images/bullet_toggle_minus.png);}
             tr.changeset { height: 20px }
             tr.changeset ul, ol { margin-top: 0px; margin-bottom: 0px; }
             tr.changeset td.revision_graph { width: 15%; background-color: #fffffb; }
             tr.changeset td.author { text-align: center; width: 15%; white-space:nowrap;}
             tr.changeset td.committed_on { text-align: center; width: 15%; white-space:nowrap;}
             table.files tbody th {text-align:left;}
             table.files tr.file td.filename { text-align: left; padding-left: 24px; }
             table.files tr.file td.digest { font-size: 80%; }
             table.members td.roles, table.memberships td.roles { width: 45%; }
             tr.message { height: 2.6em; }
             tr.message td.subject { padding-left: 20px; }
             tr.message td.created_on { white-space: nowrap; }
             tr.message td.last_message { font-size: 80%; white-space: nowrap; }
             tr.message.locked td.subject { background: url(../images/locked.png) no-repeat 0 1px; }
             tr.message.sticky td.subject { background: url(../images/bullet_go.png) no-repeat 0 1px; font-weight: bold; }
             tr.version.closed, tr.version.closed a { color: #999; }
             tr.version td.name { padding-left: 20px; }
             tr.version.shared td.name { background: url(../images/link.png) no-repeat 0% 70%; }
             tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: center; white-space:nowrap; }
             tr.user td {width:13%;white-space: nowrap;}
             td.username, td.firstname, td.lastname, td.email {text-align:left !important;}
             tr.user td.email { width:18%; }
             tr.user.locked, tr.user.registered { color: #aaa; }
             tr.user.locked a, tr.user.registered a { color: #aaa; }
             table.permissions td.role {color:#999;font-size:90%;font-weight:normal !important;text-align:center;vertical-align:bottom;}
             tr.wiki-page-version td.updated_on, tr.wiki-page-version td.author {text-align:center;}
             tr.time-entry { text-align: center; white-space: nowrap; }
             tr.time-entry td.issue, tr.time-entry td.comments, tr.time-entry td.subject, tr.time-entry td.activity { text-align: left; white-space: normal; }
             td.hours { text-align: right; font-weight: bold; padding-right: 0.5em; }
             td.hours .hours-dec { font-size: 0.9em; }
             table.plugins td { vertical-align: middle; }
             table.plugins td.configure { text-align: right; padding-right: 1em; }
             table.plugins span.name { font-weight: bold; display: block; margin-bottom: 6px; }
             table.plugins span.description { display: block; font-size: 0.9em; }
             table.plugins span.url { display: block; font-size: 0.9em; }
             tr.group td { padding: 0.8em 0 0.5em 0.3em; border-bottom: 1px solid #ccc; text-align:left; }
             tr.group span.name {font-weight:bold;}
             tr.group span.count {font-weight:bold; position:relative; top:-1px; color:#fff; font-size:10px; background:#9DB9D5; padding:0px 6px 1px 6px; border-radius:3px; margin-left:4px;}
             tr.group span.totals {color: #aaa; font-size: 80%;}
             tr.group span.totals .value {font-weight:bold; color:#777;}
             tr.group a.toggle-all { color: #aaa; font-size: 80%; display:none; float:right; margin-right:4px;}
             tr.group:hover a.toggle-all { display:inline;}
             a.toggle-all:hover {text-decoration:none;}
             table.list tbody tr:hover { background-color:#ffffdd; }
             table.list tbody tr.group:hover { background-color:inherit; }
             table td {padding:2px;}
             table p {margin:0;}
             .odd {background-color:#f6f7f8;}
             .even {background-color: #fff;}
             tr.builtin td.name {font-style:italic;}
             a.sort { padding-right: 16px; background-position: 100% 50%; background-repeat: no-repeat; }
             a.sort.asc  { background-image: url(../images/sort_asc.png); }
             a.sort.desc { background-image: url(../images/sort_desc.png); }
             table.boards a.board, h3.comments { background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 20px; }
             table.boards td.last-message {text-align:left;font-size:80%;}
             div.table-list.boards .table-list-cell.name {width: 30%;}
             table.messages td.last_message {text-align:left;}
             #query_form_content {font-size:90%;}
             .query_sort_criteria_count {
               display: inline-block;
               min-width: 1em;
             }
             table.query-columns {
               border-collapse: collapse;
               border: 0;
             }
             table.query-columns td.buttons {
               vertical-align: middle;
               text-align: center;
             }
             table.query-columns td.buttons input[type=button] {width:35px;}
             .query-totals {text-align:right;}
             .query-totals>span {margin-left:0.6em;}
             .query-totals .value {font-weight:bold;}
             body.controller-issues .query-totals {margin-top:-2.3em;}
             td.center {text-align:center;}
             h3.version { background: url(../images/package.png) no-repeat 0% 50%; padding-left: 20px; }
             div.issues h3 { background: url(../images/ticket.png) no-repeat 0% 50%; padding-left: 20px; }
             div.members h3 { background: url(../images/group.png) no-repeat 0% 50%; padding-left: 20px; }
             div.news h3 { background: url(../images/news.png) no-repeat 0% 50%; padding-left: 20px; }
             div.projects h3 { background: url(../images/projects.png) no-repeat 0% 50%; padding-left: 20px; }
             div.spent_time h3 { background: url(../images/time.png) no-repeat 0% 50%; padding-left: 20px; }
             #watchers select {width: 95%; display: block;}
             #watchers a.delete {opacity: 0.4; margin-left: 5px;}
             #watchers a.delete:hover {opacity: 1;}
             #watchers img.gravatar {margin: 0 4px 2px 0;}
             span#watchers_inputs {overflow:auto; display:block;}
             span.search_for_watchers {display:block;}
             span.search_for_watchers, span.add_attachment {font-size:80%; line-height:2.5em;}
             span.search_for_watchers a, span.add_attachment a {padding-left:16px; background: url(../images/bullet_add.png) no-repeat 0 50%; }
             .highlight { background-color: #FCFD8D;}
             .highlight.token-1 { background-color: #faa;}
             .highlight.token-2 { background-color: #afa;}
             .highlight.token-3 { background-color: #aaf;}
             .box{
               padding:6px;
               margin-bottom: 10px;
               background-color:#f6f6f6;
               color:#505050;
               line-height:1.5em;
               border: 1px solid #e4e4e4;
               word-wrap: break-word;
               border-radius: 3px;
             }
             div.square {
               border: 1px solid #999;
               float: left;
               margin: .3em .4em 0 .4em;
               overflow: hidden;
               width: .6em; height: .6em;
             }
             .contextual {float:right; white-space: nowrap; line-height:1.4em;margin:5px 0px; padding-left: 10px; font-size:0.9em;}
             .contextual input, .contextual select {font-size:0.9em;}
             .message .contextual { margin-top: 0; }
             .splitcontent {overflow:auto;}
             .splitcontentleft{float:left; width:49%;}
             .splitcontentright{float:right; width:49%;}
             form {display: inline;}
             input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;}
             input[type="submit"] { -webkit-appearance: button; }
             fieldset {border: 1px solid #e4e4e4; margin:0;}
             legend {color: #333;}
             hr { width: 100%; height: 1px; background: #ccc; border: 0;}
             blockquote { font-style: italic; border-left: 3px solid #e0e0e0; padding-left: 0.6em; margin-left: 2.4em;}
             blockquote blockquote { margin-left: 0;}
             abbr, span.field-description[title] { border-bottom: 1px dotted #aaa; cursor: help; }
             textarea.wiki-edit {width:99%; resize:vertical;}
             body.textarea-monospace textarea.wiki-edit {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; font-size: 12px;}
             body.textarea-proportional textarea.wiki-edit {font-family: Verdana, sans-serif; font-size: 12px;}
             li p {margin-top: 0;}
             div.issue {background:#ffffdd; padding:6px; margin-bottom:6px; border: 1px solid #d7d7d7; border-radius:3px;}
             p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;}
             p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; }
             p.footnote { font-size: 0.9em; margin-top: 0px; margin-bottom: 0px; }
             .ltr {direction:ltr !important; unicode-bidi:bidi-override;}
             .rtl {direction:rtl !important; unicode-bidi:bidi-override;}
             div.issue div.subject div div { padding-left: 16px; }
             div.issue div.subject p {margin: 0; margin-bottom: 0.1em; font-size: 90%; color: #999;}
             div.issue div.subject>div>p { margin-top: 0.5em; }
             div.issue div.subject h3 {margin: 0; margin-bottom: 0.1em;}
             div.issue span.private, div.journal span.private { position:relative; bottom: 2px; text-transform: uppercase; background: #d22; color: #fff; font-weight:bold; padding: 0px 2px 0px 2px; font-size: 60%; margin-right: 2px; border-radius: 2px;}
             div.issue .next-prev-links {color:#999;}
             div.issue .attributes {margin-top: 2em;}
             div.issue .attribute {padding-left:180px; clear:left; min-height: 1.8em;}
             div.issue .attribute .label {width: 170px; margin-left:-180px; font-weight:bold; float:left;}
             div.issue.overdue .due-date .value { color: #c22; }
             #issue_tree table.issues, #relations table.issues { border: 0; }
             #issue_tree td.checkbox, #relations td.checkbox {display:none;}
             #relations td.buttons {padding:0;}
             fieldset.collapsible {border-width: 1px 0 0 0;}
             fieldset.collapsible>legend { padding-left: 16px; background: url(../images/arrow_expanded.png) no-repeat 0% 40%; cursor:pointer; }
             fieldset.collapsible.collapsed>legend { background-image: url(../images/arrow_collapsed.png); }
             fieldset#date-range p { margin: 2px 0 2px 0; }
             fieldset#filters table { border-collapse: collapse; }
             fieldset#filters table td { padding: 0; vertical-align: middle; }
             fieldset#filters tr.filter { height: 2.1em; }
             fieldset#filters td.field { width:230px; }
             fieldset#filters td.operator { width:130px; }
             fieldset#filters td.operator select {max-width:120px;}
             fieldset#filters td.values { white-space:nowrap; }
             fieldset#filters td.values select {min-width:130px; max-width:200px;}
             fieldset#filters td.values input {height:1em;}
             #filters-table {width:60%; float:left;}
             .add-filter {width:35%; float:right; text-align: right; vertical-align: top;}
             #issue_is_private_wrap {float:right; margin-right:1em;}
             .toggle-multiselect {background: url(../images/bullet_toggle_plus.png) no-repeat 0% 40%; padding-left:16px; margin-left:0; margin-right:5px; cursor:pointer;}
             .buttons { font-size: 0.9em; margin-bottom: 1.4em; margin-top: 1em; }
             div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
             div#issue-changesets div.changeset { padding: 4px;}
             div#issue-changesets div.changeset { border-bottom: 1px solid #ddd; }
             div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
             div.journal {overflow:auto;}
             div.journal.private-notes {border-left:2px solid #d22; padding-left:4px; margin-left:-6px;}
             div.journal ul.details, ul.revision-info {color:#959595; margin-bottom: 1.5em;}
             div.journal ul.details a, ul.revision-info a {color:#70A7CD;}
             div.journal ul.details a:hover,  ul.revision-info a:hover {color:#D14848;}
             div#activity dl, #search-results { margin-left: 2em; }
             div#activity dd, #search-results dd { margin-bottom: 1em; padding-left: 18px; font-size: 0.9em; }
             div#activity dt, #search-results dt { margin-bottom: 0px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
             div#activity dt.me .time { border-bottom: 1px solid #999; }
             div#activity dt .time { color: #777; font-size: 80%; }
             div#activity dd .description, #search-results dd .description { font-style: italic; }
             div#activity span.project:after, #search-results span.project:after { content: " -"; }
             div#activity dd span.description, #search-results dd span.description { display:block; color: #808080; }
             div#activity dt.grouped {margin-left:5em;}
             div#activity dd.grouped {margin-left:9em;}
             div#activity dt { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; height: 18px;}
             #search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px; }
             div#search-results-counts {float:right;}
             div#search-results-counts ul { margin-top: 0.5em; }
             div#search-results-counts  li { list-style-type:none; float: left; margin-left: 1em; }
             dt.issue { background-image: url(../images/ticket.png); }
             dt.issue-edit { background-image: url(../images/ticket_edit.png); }
             dt.issue-closed { background-image: url(../images/ticket_checked.png); }
             dt.issue-note { background-image: url(../images/ticket_note.png); }
             dt.changeset { background-image: url(../images/changeset.png); }
             dt.news { background-image: url(../images/news.png); }
             dt.message { background-image: url(../images/message.png); }
             dt.reply { background-image: url(../images/comments.png); }
             dt.wiki-page { background-image: url(../images/wiki_edit.png); }
             dt.attachment { background-image: url(../images/attachment.png); }
             dt.document { background-image: url(../images/document.png); }
             dt.project { background-image: url(../images/projects.png); }
             dt.time-entry { background-image: url(../images/time.png); }
             #search-results dt.issue.closed { background-image: url(../images/ticket_checked.png); }
             div#roadmap .related-issues { margin-bottom: 1em; }
             div#roadmap .related-issues td.checkbox { display: none; }
             div#roadmap .wiki h1:first-child { display: none; }
             div#roadmap .wiki h1 { font-size: 120%; }
             div#roadmap .wiki h2 { font-size: 110%; }
             body.controller-versions.action-show div#roadmap .related-issues {width:70%;}
             div#version-summary { float:right; width:28%; margin-left: 16px; margin-bottom: 16px; background-color: #fff; }
             div#version-summary fieldset { margin-bottom: 1em; }
             div#version-summary fieldset.time-tracking table { width:100%; }
             div#version-summary th, div#version-summary td.total-hours { text-align: right; }
             table#time-report td.hours, table#time-report th.period, table#time-report th.total { text-align: right; padding-right: 0.5em; }
             table#time-report tbody tr.subtotal { font-style: italic; color:#777;}
             table#time-report tbody tr.subtotal td.hours { color:#b0b0b0; }
             table#time-report tbody tr.total { font-weight: bold; background-color:#EEEEEE; border-top:1px solid #e4e4e4;}
             table#time-report .hours-dec { font-size: 0.9em; }
             div.wiki-page .contextual a {opacity: 0.4}
             div.wiki-page .contextual a:hover {opacity: 1}
             form .attributes select { width: 60%; }
             form .attributes select + a.icon-only { vertical-align: middle; margin-left: 4px; }
             input#issue_subject, input#document_title { width: 99%; }
             select#issue_done_ratio { width: 95px; }
             ul.projects {margin:0; padding-left:1em;}
             ul.projects ul {padding-left:1.6em;}
             ul.projects.root {margin:0; padding:0;}
             ul.projects li {list-style-type:none;}
             #projects-index {
               column-count: auto;
               column-width: 400px;
               -webkit-column-count: auto;
               -webkit-column-width: 400px;
               -webkit-column-gap : 0.5rem;
               -moz-column-count: auto;
               -moz-column-width: 400px;
               -moz-column-gap : 0.5rem;
             }
             #projects-index ul.projects ul.projects { border-left: 3px solid #e0e0e0; padding-left:1em;}
             #projects-index ul.projects li.root {margin-bottom: 1em;}
             #projects-index ul.projects li.child {margin-top: 1em;}
             #projects-index ul.projects div.root a.project { font-family: "Trebuchet MS", Verdana, sans-serif; font-weight: bold; font-size: 16px; margin: 0 0 10px 0; }
             .my-project { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; }
             #notified-projects>ul, #tracker_project_ids>ul, #custom_field_project_ids>ul {max-height:250px; overflow-y:auto;}
             #related-issues li img {vertical-align:middle;}
             ul.properties {padding:0; font-size: 0.9em; color: #777;}
             ul.properties li {list-style-type:none;}
             ul.properties li span {font-style:italic;}
             .total-hours { font-size: 110%; font-weight: bold; }
             .total-hours span.hours-int { font-size: 120%; }
             .autoscroll {overflow-x: auto; padding:1px; margin-bottom: 1.2em; position: relative;}
             #user_login, #user_firstname, #user_lastname, #user_mail, #my_account_form select, #user_form select, #user_identity_url { width: 90%; }
             #workflow_copy_form select { width: 200px; }
             table.transitions td.enabled {background: #bfb;}
             #workflow_form table select {font-size:90%; max-width:100px;}
             table.fields_permissions td.readonly {background:#ddd;}
             table.fields_permissions td.required {background:#d88;}
             select.expandable {vertical-align:top;}
             textarea#custom_field_possible_values {width: 95%; resize:vertical}
             textarea#custom_field_default_value {width: 95%; resize:vertical}
             .sort-handle {display:inline-block; vertical-align:middle;}
             input#content_comments {width: 99%}
             span.pagination {margin-left:3px; color:#888; display:block;}
             .pagination ul.pages {
               margin: 0 5px 0 0;
               padding: 0;
               display: inline;
             }
             .pagination ul.pages li {
               display: inline-block;
               padding: 0;
               border: 1px solid #ddd;
               margin-left: -1px;
               line-height: 2em;
               margin-bottom: 1em;
               white-space: nowrap;
               text-align: center;
             }
             .pagination ul.pages li a,
             .pagination ul.pages li span {
               padding: 3px 8px;
             }
             .pagination ul.pages li:first-child {
               border-top-left-radius: 4px;
               border-bottom-left-radius: 4px;
             }
             .pagination ul.pages li:last-child {
               border-top-right-radius: 4px;
               border-bottom-right-radius: 4px;
             }
             .pagination ul.pages li.current {
               color: white;
               background-color: #628DB6;
               border-color: #628DB6;
             }
             .pagination ul.pages li.page:hover {
               background-color: #ddd;
             }
             .pagination ul.pages li.page a:hover,
             .pagination ul.pages li.page a:active {
               color: #169;
               text-decoration: inherit;
             }
             .pagination .per-page span.selected {
               font-weight: bold;
             }
             span.pagination>span {white-space:nowrap;}
             #search-form fieldset p {margin:0.2em 0;}
             /***** Tabular forms ******/
             .tabular p{
               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;
             }
             html>body .tabular p {overflow:hidden;}
             .tabular input, .tabular select {max-width:95%}
             .tabular textarea {width:95%; resize:vertical;}
             .tabular label{
               font-weight: bold;
               float: left;
               text-align: right;
               /* width of left column */
               margin-left: -180px;
               /* width of labels. Should be smaller than left column to create some right margin */
               width: 175px;
             }
             .tabular label.floating{
               font-weight: normal;
               margin-left: 0px;
               text-align: 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{
               font-weight: normal;
               float:none;
               margin-left: 5px !important;
               width: auto;
             }
             label.no-css {
               font-weight: inherit;
               float:none;
               text-align:left;
               margin-left:0px;
               width:auto;
             }
             input#time_entry_comments { width: 90%;}
             #preview fieldset {margin-top: 1em; background: url(../images/draft.png)}
             .tabular.settings p{ padding-left: 300px; }
             .tabular.settings label{ margin-left: -300px; width: 295px; }
             .tabular.settings textarea { width: 99%; }
             .settings.enabled_scm table {width:100%}
             .settings.enabled_scm td.scm_name{ font-weight: bold; }
             fieldset.settings label { display: block; }
             fieldset#notified_events .parent { padding-left: 20px; }
             span.required {color: #bb0000;}
             .summary {font-style: italic;}
             .check_box_group {
               display:block;
               width:95%;
               max-height:300px;
               overflow-y:auto;
               padding:2px 4px 4px 2px;
               background:#fff;
               border:1px solid #9EB1C2;
               border-radius:2px
             }
             .check_box_group label {
               font-weight: normal;
               margin-left: 0px !important;
               text-align: left;
               float: none;
               display: block;
               width: auto;
             }
             .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;}
             div.fileover { background-color: lavender; }
             div.attachments { margin: 12px 0; }
             div.attachments p { margin:4px 0 2px 0; }
             div.attachments img { vertical-align: middle; }
             div.attachments span.author { font-size: 0.9em; color: #888; }
             div.thumbnails {margin:0.6em;}
             div.thumbnails div {background:#fff;border:2px solid #ddd;display:inline-block;margin-right:2px;}
             div.thumbnails img {margin: 3px; vertical-align: middle;}
             #history div.thumbnails {margin-left: 2em;}
             p.other-formats { text-align: right; font-size:0.9em; color: #666; }
             .other-formats span + span:before { content: "| "; }
             a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }
             em.info {font-style:normal;font-size:90%;color:#888;display:block;}
             em.info.error {padding-left:20px; background:url(../images/exclamation.png) no-repeat 0 50%;}
             textarea.text_cf {width:95%; resize:vertical;}
             input.string_cf, input.link_cf {width:95%;}
             select.bool_cf {width:auto !important;}
             #tab-content-modules fieldset p {margin:3px 0 4px 0;}
             #tab-content-users .splitcontentleft {width: 64%;}
             #tab-content-users .splitcontentright {width: 34%;}
             #tab-content-users fieldset {padding:1em; margin-bottom: 1em;}
             #tab-content-users fieldset legend {font-weight: bold;}
             #tab-content-users fieldset label {display: block;}
             #tab-content-users #principals {max-height: 400px; overflow: auto;}
             #users_for_watcher {height: 200px; overflow:auto;}
             #users_for_watcher label {display: block;}
             table.members td.name {padding-left: 20px;}
             table.members td.group, table.members td.groupnonmember, table.members td.groupanonymous {background: url(../images/group.png) no-repeat 0% 1px;}
             input#principal_search, input#user_search {width:90%}
             .roles-selection label {display:inline-block; width:210px;}
             input.autocomplete {
               background: #fff url(../images/magnifier.png) no-repeat 2px 50%; padding-left:20px !important;
               border:1px solid #9EB1C2; border-radius:2px; height:1.5em;
             }
             input.autocomplete.ajax-loading {
               background-image: url(../images/loading.gif);
             }
             .role-visibility {padding-left:2em;}
             .objects-selection {
               height: 300px;
               overflow: auto;
               margin-bottom: 1em;
             }
             .objects-selection label {
               display: block;
             }
             .objects-selection>div, #user_group_ids {
               column-count: auto;
               column-width: 200px;
               -webkit-column-count: auto;
               -webkit-column-width: 200px;
               -webkit-column-gap : 0.5rem;
               -webkit-column-rule: 1px solid #ccc;
               -moz-column-count: auto;
               -moz-column-width: 200px;
               -moz-column-gap : 0.5rem;
               -moz-column-rule: 1px solid #ccc;
             }
             /***** Flash & error messages ****/
             #errorExplanation, div.flash, .nodata, .warning, .conflict {
               padding: 6px 4px 6px 30px;
               margin-bottom: 12px;
               font-size: 1.1em;
               border: 1px solid;
               border-radius: 3px;
             }
             div.flash {margin-top: 8px;}
             div.flash.error, #errorExplanation {
               background: url(../images/exclamation.png) 8px 50% no-repeat;
               background-color: #ffe3e3;
               border-color: #d88;
               color: #880000;
             }
             div.flash.notice {
               background: url(../images/true.png) 8px 5px no-repeat;
               background-color: #dfffdf;
               border-color: #9fcf9f;
               color: #005f00;
             }
             div.flash.warning, .conflict {
               background: url(../images/warning.png) 8px 5px no-repeat;
               background-color: #F3EDD1;
               border-color: #eadbbc;
               color: #A6750C;
               text-align: left;
             }
             .nodata, .warning {
               text-align: center;
               background-color: #F3EDD1;
               border-color: #eadbbc;
               color: #A6750C;
             }
             #errorExplanation ul { font-size: 0.9em;}
             #errorExplanation h2, #errorExplanation p { display: none; }
             .conflict-details {font-size:80%;}
             /***** Ajax indicator ******/
             #ajax-indicator {
             position: absolute; /* fixed not supported by IE */
             background-color:#eee;
             border: 1px solid #bbb;
             top:35%;
             left:40%;
             width:20%;
             font-weight:bold;
             text-align:center;
             padding:0.6em;
             z-index:100;
             opacity: 0.5;
             }
             html>body #ajax-indicator { position: fixed; }
             #ajax-indicator span {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             background-image: url(../images/loading.gif);
             padding-left: 26px;
             vertical-align: bottom;
             }
             /***** Calendar *****/
             table.cal {border-collapse: collapse; width: 100%; margin: 0px 0 6px 0;border: 1px solid #d7d7d7;}
             table.cal thead th {width: 14%; background-color:#EEEEEE; padding: 4px; }
             table.cal thead th.week-number {width: auto;}
             table.cal tbody tr {height: 100px;}
             table.cal td {border: 1px solid #d7d7d7; vertical-align: top; font-size: 0.9em;}
             table.cal td.week-number { background-color:#EEEEEE; padding: 4px; border:none; font-size: 1em;}
             table.cal td p.day-num {font-size: 1.1em; text-align:right;}
             table.cal td.odd p.day-num {color: #bbb;}
             table.cal td.today {background:#ffffdd;}
             table.cal td.today p.day-num {font-weight: bold;}
             table.cal .starting a, p.cal.legend .starting {background: url(../images/bullet_go.png) no-repeat -1px -2px; padding-left:16px;}
             table.cal .ending a, p.cal.legend .ending {background: url(../images/bullet_end.png) no-repeat -1px -2px; padding-left:16px;}
             table.cal .starting.ending a, p.cal.legend .starting.ending {background: url(../images/bullet_diamond.png) no-repeat -1px -2px; padding-left:16px;}
             p.cal.legend span {display:block;}
             /***** Tooltips ******/
             .tooltip{position:relative;z-index:24;}
             .tooltip:hover{z-index:25;color:#000;}
             .tooltip span.tip{display: none; text-align:left;}
             div.tooltip:hover span.tip{
             display:block;
             position:absolute;
             top:12px; width:270px;
             border:1px solid #555;
             background-color:#fff;
             padding: 4px;
             font-size: 0.8em;
             color:#505050;
             }
             img.ui-datepicker-trigger {
               cursor: pointer;
               vertical-align: middle;
               margin-left: 4px;
             }
             /***** Progress bar *****/
             table.progress {
               border-collapse: collapse;
               border-spacing: 0pt;
               empty-cells: show;
               text-align: center;
               float:left;
               margin: 1px 6px 1px 0px;
             }
             table.progress {width:80px;}
             table.progress td { height: 1em; }
             table.progress td.closed { background: #BAE0BA none repeat scroll 0%; }
             table.progress td.done { background: #D3EDD3 none repeat scroll 0%; }
             table.progress td.todo { background: #eee none repeat scroll 0%; }
             p.percent {font-size: 80%; margin:0;}
             p.progress-info {clear: left; font-size: 80%; margin-top:-4px; color:#777;}
             .version-overview table.progress {width:40em;}
             .version-overview table.progress td { height: 1.2em; }
             /***** Tabs *****/
             #content .tabs {height: 2.6em; margin-bottom:1.2em; position:relative; overflow:hidden;}
             #content .tabs ul {margin:0; position:absolute; bottom:0; padding-left:0.5em; width: 2000px; border-bottom: 1px solid #bbbbbb;}
             #content .tabs ul li {
               float:left;
               list-style-type:none;
               white-space:nowrap;
               margin-right:4px;
               background:#fff;
               position:relative;
               margin-bottom:-1px;
             }
             #content .tabs ul li a{
               display:block;
               font-size: 0.9em;
               text-decoration:none;
               line-height:1.3em;
               padding:4px 6px 4px 6px;
               border: 1px solid #ccc;
               border-bottom: 1px solid #bbbbbb;
               background-color: #f6f6f6;
               color:#999;
               font-weight:bold;
               border-top-left-radius:3px;
               border-top-right-radius:3px;
             }
             #content .tabs ul li a:hover {
               background-color: #ffffdd;
               text-decoration:none;
             }
             #content .tabs ul li a.selected {
               background-color: #fff;
               border: 1px solid #bbbbbb;
               border-bottom: 1px solid #fff;
               color:#444;
             }
             #content .tabs ul li a.selected:hover {background-color: #fff;}
             div.tabs-buttons { position:absolute; right: 0; width: 54px; height: 24px; background: white; bottom: 0; border-bottom: 1px solid #bbbbbb; }
             button.tab-left, button.tab-right {
               font-size: 0.9em;
               cursor: pointer;
               height:24px;
               border: 1px solid #ccc;
               border-bottom: 1px solid #bbbbbb;
               position:absolute;
               padding:4px;
               width: 20px;
               bottom: -1px;
             }
             button.tab-left:hover, button.tab-right:hover {
               background-color: #f5f5f5;
             }
             button.tab-left:focus, button.tab-right:focus {
               outline: 0;
             }
             button.tab-left {
               right: 20px;
               background: #eeeeee url(../images/bullet_arrow_left.png) no-repeat 50% 50%;
               border-top-left-radius:3px;
             }
             button.tab-right {
               right: 0;
               background: #eeeeee url(../images/bullet_arrow_right.png) no-repeat 50% 50%;
               border-top-right-radius:3px;
             }
             button.tab-left.disabled, button.tab-right.disabled {
               background-color: #ccc;
               cursor: unset;
             }
             /***** Diff *****/
             .diff_out { background: #fcc; }
             .diff_out span { background: #faa; }
             .diff_in { background: #cfc; }
             .diff_in span { background: #afa; }
             .text-diff {
               padding: 1em;
               background-color:#f6f6f6;
               color:#505050;
               border: 1px solid #e4e4e4;
             }
             /***** Wiki *****/
             div.wiki table {
               border-collapse: collapse;
               margin-bottom: 1em;
             }
             div.wiki table, div.wiki td, div.wiki th {
               border: 1px solid #bbb;
               padding: 4px;
             }
             div.wiki .noborder, div.wiki .noborder td, div.wiki .noborder th {border:0;}
             div.wiki .external {
               background-position: 0% 60%;
               background-repeat: no-repeat;
               padding-left: 12px;
               background-image: url(../images/external.png);
             }
             div.wiki a {word-wrap: break-word;}
             div.wiki a.new {color: #b73535;}
             div.wiki ul, div.wiki ol {margin-bottom:1em;}
             div.wiki li>ul, div.wiki li>ol {margin-bottom: 0;}
             div.wiki pre {
               margin: 1em 1em 1em 1.6em;
               padding: 8px;
               background-color: #fafafa;
               border: 1px solid #e2e2e2;
               border-radius: 3px;
               width:auto;
               overflow-x: auto;
               overflow-y: hidden;
             }
             div.wiki ul.toc {
               background-color: #ffffdd;
               border: 1px solid #e4e4e4;
               padding: 4px;
               line-height: 1.2em;
               margin-bottom: 12px;
               margin-right: 12px;
               margin-left: 0;
               display: table
             }
             * html div.wiki ul.toc { width: 50%; } /* IE6 doesn't autosize div */
             div.wiki ul.toc.right { float: right; margin-left: 12px; margin-right: 0; width: auto; }
             div.wiki ul.toc.left  { float: left; margin-right: 12px; margin-left: 0; width: auto; }
             div.wiki ul.toc ul { margin: 0; padding: 0; }
             div.wiki ul.toc li {list-style-type:none; margin: 0; font-size:12px;}
             div.wiki ul.toc li li {margin-left: 1.5em; font-size:10px;}
             div.wiki ul.toc a {
               font-size: 0.9em;
               font-weight: normal;
               text-decoration: none;
               color: #606060;
             }
             div.wiki ul.toc a:hover { color: #c61a1a; text-decoration: underline;}
             a.wiki-anchor { display: none; margin-left: 6px; text-decoration: none; }
             a.wiki-anchor:hover { color: #aaa !important; text-decoration: none; }
             h1:hover a.wiki-anchor, h2:hover a.wiki-anchor, h3:hover a.wiki-anchor { display: inline; color: #ddd; }
             div.wiki img {vertical-align:middle; max-width:100%;}
             /***** My page layout *****/
             .block-receiver {
               border:1px dashed #c0c0c0;
               margin-bottom: 20px;
               padding: 15px 0 15px 0;
             }
             .mypage-box {
               margin:0 0 20px 0;
               color:#505050;
               line-height:1.5em;
             }
             .handle {cursor: move;}
             a.close-icon {
               display:block;
               margin-top:3px;
               overflow:hidden;
               width:12px;
               height:12px;
               background-repeat: no-repeat;
               cursor:pointer;
               background-image:url('../images/close.png');
             }
             a.close-icon:hover {background-image:url('../images/close_hl.png');}
             /***** Gantt chart *****/
             .gantt_hdr {
               position:absolute;
               top:0;
               height:16px;
               border-top: 1px solid #c0c0c0;
               border-bottom: 1px solid #c0c0c0;
               border-right: 1px solid #c0c0c0;
               text-align: center;
               overflow: hidden;
             }
             .gantt_hdr.nwday {background-color:#f1f1f1; color:#999;}
             .gantt_subjects { font-size: 0.8em; }
             .gantt_subjects div { line-height:16px;height:16px;overflow:hidden;white-space:nowrap;text-overflow: ellipsis; }
             .task {
               position: absolute;
               height:8px;
               font-size:0.8em;
               color:#888;
               padding:0;
               margin:0;
               line-height:16px;
               white-space:nowrap;
             }
             .task.label {width:100%;}
             .task.label.project, .task.label.version { font-weight: bold; }
             .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
             .task_done { background:#00c600 url(../images/task_done.png); border: 1px solid #00c600; }
             .task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
             .task_todo.parent { background: #888; border: 1px solid #888; height: 3px;}
             .task_late.parent, .task_done.parent { height: 3px;}
             .task.parent.marker.starting  { position: absolute; background: url(../images/task_parent_end.png) no-repeat 0 0; width: 8px; height: 16px; margin-left: -4px; left: 0px; top: -1px;}
             .task.parent.marker.ending { position: absolute; background: url(../images/task_parent_end.png) no-repeat 0 0; width: 8px; height: 16px; margin-left: -4px; right: 0px; top: -1px;}
             .version.task_late { background:#f66 url(../images/milestone_late.png); border: 1px solid #f66; height: 2px; margin-top: 3px;}
             .version.task_done { background:#00c600 url(../images/milestone_done.png); border: 1px solid #00c600; height: 2px; margin-top: 3px;}
             .version.task_todo { background:#fff url(../images/milestone_todo.png); border: 1px solid #fff; height: 2px; margin-top: 3px;}
             .version.marker { background-image:url(../images/version_marker.png); background-repeat: no-repeat; border: 0; margin-left: -4px; margin-top: 1px; }
             .project.task_late { background:#f66 url(../images/milestone_late.png); border: 1px solid #f66; height: 2px; margin-top: 3px;}
             .project.task_done { background:#00c600 url(../images/milestone_done.png); border: 1px solid #00c600; height: 2px; margin-top: 3px;}
             .project.task_todo { background:#fff url(../images/milestone_todo.png); border: 1px solid #fff; height: 2px; margin-top: 3px;}
             .project.marker { background-image:url(../images/project_marker.png); background-repeat: no-repeat; border: 0; margin-left: -4px; margin-top: 1px; }
             .version-behind-schedule a, .issue-behind-schedule a {color: #f66914;}
             .version-overdue a, .issue-overdue a, .project-overdue a {color: #f00;}
             /***** Icons *****/
             .icon {
               background-position: 0% 50%;
               background-repeat: no-repeat;
               padding-left: 20px;
               padding-top: 2px;
               padding-bottom: 3px;
             }
             .icon-only {
               background-position: 0% 50%;
               background-repeat: no-repeat;
               padding-left: 16px;
               display: inline-block;
               width: 0;
               height: 16px;
               overflow: hidden;
               padding-top: 0;
               padding-bottom: 0;
               font-size: 8px;
-              vertical-align: text-bottom;
+              vertical-align: middle;
             }
             .icon-only::after {
               content: "&nbsp;";
             }
             .icon-add { background-image: url(../images/add.png); }
             .icon-edit { background-image: url(../images/edit.png); }
             .icon-copy { background-image: url(../images/copy.png); }
             .icon-duplicate { background-image: url(../images/duplicate.png); }
             .icon-del { background-image: url(../images/delete.png); }
             .icon-move { background-image: url(../images/move.png); }
             .icon-save { background-image: url(../images/save.png); }
             .icon-cancel { background-image: url(../images/cancel.png); }
             .icon-multiple { background-image: url(../images/table_multiple.png); }
             .icon-folder { background-image: url(../images/folder.png); }
             .open .icon-folder { background-image: url(../images/folder_open.png); }
             .icon-package { background-image: url(../images/package.png); }
             .icon-user { background-image: url(../images/user.png); }
             .icon-projects { background-image: url(../images/projects.png); }
             .icon-help { background-image: url(../images/help.png); }
             .icon-attachment  { background-image: url(../images/attachment.png); }
             .icon-history  { background-image: url(../images/history.png); }
             .icon-time  { background-image: url(../images/time.png); }
             .icon-time-add  { background-image: url(../images/time_add.png); }
             .icon-stats  { background-image: url(../images/stats.png); }
             .icon-warning  { background-image: url(../images/warning.png); }
             .icon-error { background-image: url(../images/exclamation.png); }
             .icon-fav  { background-image: url(../images/fav.png); }
             .icon-fav-off  { background-image: url(../images/fav_off.png); }
             .icon-reload  { background-image: url(../images/reload.png); }
             .icon-lock  { background-image: url(../images/locked.png); }
             .icon-unlock  { background-image: url(../images/unlock.png); }
             .icon-checked  { background-image: url(../images/toggle_check.png); }
             .icon-details  { background-image: url(../images/zoom_in.png); }
             .icon-report  { background-image: url(../images/report.png); }
             .icon-comment  { background-image: url(../images/comment.png); }
             .icon-summary  { background-image: url(../images/lightning.png); }
             .icon-server-authentication { background-image: url(../images/server_key.png); }
             .icon-issue { background-image: url(../images/ticket.png); }
             .icon-zoom-in { background-image: url(../images/zoom_in.png); }
             .icon-zoom-out { background-image: url(../images/zoom_out.png); }
             .icon-magnifier { background-image: url(../images/magnifier.png); }
             .icon-passwd { background-image: url(../images/textfield_key.png); }
             .icon-test { background-image: url(../images/bullet_go.png); }
             .icon-email { background-image: url(../images/email.png); }
             .icon-email-disabled { background-image: url(../images/email_disabled.png); }
             .icon-email-add { background-image: url(../images/email_add.png); }
             .icon-move-up { background-image: url(../images/1uparrow.png); }
             .icon-move-top { background-image: url(../images/2uparrow.png); }
             .icon-move-down { background-image: url(../images/1downarrow.png); }
             .icon-move-bottom { background-image: url(../images/2downarrow.png); }
             .icon-ok { background-image: url(../images/true.png); }
             .icon-not-ok { background-image: url(../images/false.png); }
             .icon-link-break { background-image: url(../images/link_break.png); }
             .icon-list { background-image: url(../images/text_list_bullets.png); }
             .icon-file { background-image: url(../images/files/default.png); }
             .icon-file.text-plain { background-image: url(../images/files/text.png); }
             .icon-file.text-x-c { background-image: url(../images/files/c.png); }
             .icon-file.text-x-csharp { background-image: url(../images/files/csharp.png); }
             .icon-file.text-x-java { background-image: url(../images/files/java.png); }
             .icon-file.text-x-javascript { background-image: url(../images/files/js.png); }
             .icon-file.text-x-php { background-image: url(../images/files/php.png); }
             .icon-file.text-x-ruby { background-image: url(../images/files/ruby.png); }
             .icon-file.text-xml { background-image: url(../images/files/xml.png); }
             .icon-file.text-css { background-image: url(../images/files/css.png); }
             .icon-file.text-html { background-image: url(../images/files/html.png); }
             .icon-file.image-gif { background-image: url(../images/files/image.png); }
             .icon-file.image-jpeg { background-image: url(../images/files/image.png); }
             .icon-file.image-png { background-image: url(../images/files/image.png); }
             .icon-file.image-tiff { background-image: url(../images/files/image.png); }
             .icon-file.application-pdf { background-image: url(../images/files/pdf.png); }
             .icon-file.application-zip { background-image: url(../images/files/zip.png); }
             .icon-file.application-x-gzip { background-image: url(../images/files/zip.png); }
             .sort-handle { width:16px; height:16px; background:url(../images/reorder.png) no-repeat 0 50%; cursor:move; }
             .sort-handle.ajax-loading { background-image: url(../images/loading.gif); }
             tr.ui-sortable-helper { border:1px solid #e4e4e4; }
             .contextual>.icon:not(:first-child), .buttons>.icon:not(:first-child) { margin-left: 5px; }
             img.gravatar {
               vertical-align: middle;
               border-radius: 20%;
             }
             div.issue img.gravatar {
               float: left;
               margin: 0 6px 0 0;
             }
             h2 img.gravatar {margin: -2px 4px -4px 0;}
             h3 img.gravatar {margin: -4px 4px -4px 0;}
             h4 img.gravatar {margin: -2px 4px -4px 0;}
             td.username img.gravatar {margin: 0 0.5em 0 0; vertical-align: top;}
             #activity dt img.gravatar {float: left; margin: 0 1em 1em 0;}
             /* Used on 12px Gravatar img tags without the icon background */
             .icon-gravatar {float: left; margin-right: 4px;}
             #activity dt, .journal {clear: left;}
             .journal-link {float: right;}
             h2 img { vertical-align:middle; }
             .hascontextmenu { cursor: context-menu; }
             .sample-data {border:1px solid #ccc; border-collapse:collapse; background-color:#fff; margin:0.5em;}
             .sample-data td {border:1px solid #ccc; padding: 2px 4px; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;}
             .sample-data tr:first-child td {font-weight:bold; text-align:center;}
             .ui-progressbar {position: relative;}
             #progress-label {
             position: absolute; left: 50%; top: 4px;
             font-weight: bold;
             color: #555; text-shadow: 1px 1px 0 #fff;
             }
             /* Custom JQuery styles */
             .ui-datepicker-title select {width:70px !important; margin-top:-2px !important; margin-right:4px !important;}
             /************* CodeRay styles *************/
             .syntaxhl div {display: inline;}
             .syntaxhl .code pre { overflow: auto }
             .syntaxhl .annotation { color:#007 }
             .syntaxhl .attribute-name { color:#b48 }
             .syntaxhl .attribute-value { color:#700 }
             .syntaxhl .binary { color:#549 }
             .syntaxhl .binary .char { color:#325 }
             .syntaxhl .binary .delimiter { color:#325 }
             .syntaxhl .char { color:#D20 }
             .syntaxhl .char .content { color:#D20 }
             .syntaxhl .char .delimiter { color:#710 }
             .syntaxhl .class { color:#B06; font-weight:bold }
             .syntaxhl .class-variable { color:#369 }
             .syntaxhl .color { color:#0A0 }
             .syntaxhl .comment { color:#777 }
             .syntaxhl .comment .char { color:#444 }
             .syntaxhl .comment .delimiter { color:#444 }
             .syntaxhl .constant { color:#036; font-weight:bold }
             .syntaxhl .decorator { color:#B0B }
             .syntaxhl .definition { color:#099; font-weight:bold }
             .syntaxhl .delimiter { color:black }
             .syntaxhl .directive { color:#088; font-weight:bold }
             .syntaxhl .docstring { color:#D42; }
             .syntaxhl .doctype { color:#34b }
             .syntaxhl .done { text-decoration: line-through; color: gray }
             .syntaxhl .entity { color:#800; font-weight:bold }
             .syntaxhl .error { color:#F00; background-color:#FAA }
             .syntaxhl .escape  { color:#666 }
             .syntaxhl .exception { color:#C00; font-weight:bold }
             .syntaxhl .float { color:#60E }
             .syntaxhl .function { color:#06B; font-weight:bold }
             .syntaxhl .function .delimiter { color:#059 }
             .syntaxhl .function .content { color:#037 }
             .syntaxhl .global-variable { color:#d70 }
             .syntaxhl .hex { color:#02b }
             .syntaxhl .id  { color:#33D; font-weight:bold }
             .syntaxhl .include { color:#B44; font-weight:bold }
             .syntaxhl .inline { background-color: hsla(0,0%,0%,0.07); color: black }
             .syntaxhl .inline-delimiter { font-weight: bold; color: #666 }
             .syntaxhl .instance-variable { color:#33B }
             .syntaxhl .integer  { color:#00D }
             .syntaxhl .imaginary { color:#f00 }
             .syntaxhl .important { color:#D00 }
             .syntaxhl .key { color: #606 }
             .syntaxhl .key .char { color: #60f }
             .syntaxhl .key .delimiter { color: #404 }
             .syntaxhl .keyword { color:#080; font-weight:bold }
             .syntaxhl .label { color:#970; font-weight:bold }
             .syntaxhl .local-variable { color:#950 }
             .syntaxhl .map .content { color:#808 }
             .syntaxhl .map .delimiter { color:#40A}
             .syntaxhl .map { background-color:hsla(200,100%,50%,0.06); }
             .syntaxhl .namespace { color:#707; font-weight:bold }
             .syntaxhl .octal { color:#40E }
             .syntaxhl .operator { }
             .syntaxhl .predefined { color:#369; font-weight:bold }
             .syntaxhl .predefined-constant { color:#069 }
             .syntaxhl .predefined-type { color:#0a8; font-weight:bold }
             .syntaxhl .preprocessor { color:#579 }
             .syntaxhl .pseudo-class { color:#00C; font-weight:bold }
             .syntaxhl .regexp { background-color:hsla(300,100%,50%,0.06); }
             .syntaxhl .regexp .content { color:#808 }
             .syntaxhl .regexp .delimiter { color:#404 }
             .syntaxhl .regexp .modifier { color:#C2C }
             .syntaxhl .reserved { color:#080; font-weight:bold }
             .syntaxhl .shell { background-color:hsla(120,100%,50%,0.06); }
             .syntaxhl .shell .content { color:#2B2 }
             .syntaxhl .shell .delimiter { color:#161 }
             .syntaxhl .string { background-color:hsla(0,100%,50%,0.05); }
             .syntaxhl .string .char { color: #b0b }
             .syntaxhl .string .content { color: #D20 }
             .syntaxhl .string .delimiter { color: #710 }
             .syntaxhl .string .modifier { color: #E40 }
             .syntaxhl .symbol { color:#A60 }
             .syntaxhl .symbol .content { color:#A60 }
             .syntaxhl .symbol .delimiter { color:#740 }
             .syntaxhl .tag { color:#070; font-weight:bold }
             .syntaxhl .type { color:#339; font-weight:bold }
             .syntaxhl .value { color: #088 }
             .syntaxhl .variable { color:#037 }
             .syntaxhl .insert { background: hsla(120,100%,50%,0.12) }
             .syntaxhl .delete { background: hsla(0,100%,50%,0.12) }
             .syntaxhl .change { color: #bbf; background: #007 }
             .syntaxhl .head { color: #f8f; background: #505 }
             .syntaxhl .head .filename { color: white; }
             .syntaxhl .delete .eyecatcher { background-color: hsla(0,100%,50%,0.2); border: 1px solid hsla(0,100%,45%,0.5); margin: -1px; border-bottom: none; border-top-left-radius: 5px; border-top-right-radius: 5px; }
             .syntaxhl .insert .eyecatcher { background-color: hsla(120,100%,50%,0.2); border: 1px solid hsla(120,100%,25%,0.5); margin: -1px; border-top: none; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; }
             .syntaxhl .insert .insert { color: #0c0; background:transparent; font-weight:bold }
             .syntaxhl .delete .delete { color: #c00; background:transparent; font-weight:bold }
             .syntaxhl .change .change { color: #88f }
             .syntaxhl .head .head { color: #f4f }
             /***** Media print specific styles *****/
             @media print {
               #top-menu, #header, #main-menu, #sidebar, #footer, .contextual, .other-formats { display:none; }
               #main { background: #fff; }
               #content { width: 99%; margin: 0; padding: 0; border: 0; background: #fff; overflow: visible !important;}
               #wiki_add_attachment { display:none; }
               .hide-when-print, .pagination ul.pages, .pagination .per-page { display: none !important; }
               .autoscroll {overflow-x: visible;}
               table.list {margin-top:0.5em;}
               table.list th, table.list td {border: 1px solid #aaa;}
             }
             /* Accessibility specific styles */
             .hidden-for-sighted {
               position:absolute;
               left:-10000px;
               top:auto;
               width:1px;
               height:1px;
               overflow:hidden;
             }

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