jro_apps/redmine Commit - r15869:b40d66f39fa8

Option for long text custom fields to be displayed under the description field (#21705)....

Jean-Philippe Lang -

r15869:b40d66f39fa8

parent child

Context file:

r15869:b40d66f39fa8

Collapse all files

app/helpers/issues_helper.rb +22 -2

@@ -239,8 +239,8 module IssuesHelper
239	r.to_html	239	r.to_html
240	end	240	end
241		241
242	def render_custom_fields_rows(issue)	242	def render_half_width_custom_fields_rows(issue)
243	values = issue.visible_custom_field_values	243	values = issue.visible_custom_field_values.reject {\|value\| value.custom_field.full_width_layout?}
244	return if values.empty?	244	return if values.empty?
245	half = (values.size / 2.0).ceil	245	half = (values.size / 2.0).ceil
246	issue_fields_rows do \|rows\|	246	issue_fields_rows do \|rows\|
@@ -252,6 +252,26 module IssuesHelper
252	end	252	end
253	end	253	end
254		254
		255	def render_full_width_custom_fields_rows(issue)
		256	values = issue.visible_custom_field_values.select {\|value\| value.custom_field.full_width_layout?}
		257	return if values.empty?
		258
		259	s = ''
		260	values.each_with_index do \|value, i\|
		261	if value.custom_field.text_formatting == 'full'
		262	attr_value = content_tag('div', show_value(value), class: 'wiki')
		263	else
		264	attr_value = show_value(value)
		265	end
		266	content =
		267	content_tag('hr') +
		268	content_tag('p', content_tag('strong', custom_field_name_tag(value.custom_field) )) +
		269	content_tag('div', attr_value, class: 'value')
		270	s << content_tag('div', content, class: "cf_#{value.custom_field.id} attribute")
		271	end
		272	s.html_safe
		273	end
		274
255	# Returns the path for updating the issue form	275	# Returns the path for updating the issue form
256	# with project as the current project	276	# with project as the current project
257	def update_issue_form_path(project, issue)	277	def update_issue_form_path(project, issue)

app/models/custom_field.rb +6 -1

                 'edit_tag_style',
                 'user_role',
                 'version_status',
-                'extensions_allowed'
+                'extensions_allowed',
+                'full_width_layout'
               def format
                 @format ||= Redmine::FieldFormat.find(field_format)
                 format.totalable_supported
               end
+              def full_width_layout?
+                full_width_layout == '1'
+              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.

app/views/custom_fields/formats/_text.html.erb +3 0

             <%= render :partial => 'custom_fields/formats/regexp', :locals => {:f => f, :custom_field => custom_field} %>
             <p><%= f.check_box :text_formatting, {:label => :setting_text_formatting}, 'full', '' %></p>
+            <% if @custom_field.class.name == "IssueCustomField" %>
+            <p><%= f.check_box :full_width_layout %></p>
+            <% end %>
             <p><%= f.text_area(:default_value, :rows => 5) %></p>

app/views/issues/_form_custom_fields.html.erb +7 0

             <% custom_field_values = @issue.editable_custom_field_values %>
+            <% custom_field_values_full_width = custom_field_values.select { |value| value.custom_field.full_width_layout? } %>
+            <% custom_field_values -= custom_field_values_full_width %>
             <% if custom_field_values.present? %>
             <div class="splitcontent">
             <div class="splitcontentleft">
             </div>
             </div>
             <% end %>
+            <% custom_field_values_full_width.each do |value| %>
+              <p><%= custom_field_tag_with_label :issue, value, :required => @issue.required_attribute?(value.custom_field_id) %></p>
+            <% end %>

app/views/issues/show.html.erb +3 -1

                 end
               end
             end %>
-            <%= render_custom_fields_rows(@issue) %>
+            <%= render_half_width_custom_fields_rows(@issue) %>
             <%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
             </div>
             <%= link_to_attachments @issue, :thumbnails => true %>
             <% end -%>
+            <%= render_full_width_custom_fields_rows(@issue) %>
             <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
             <% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>

config/locales/en.yml +1 0

               field_textarea_font: Font used for text areas
               field_updated_by: Updated by
               field_last_updated_by: Last updated by
+              field_full_width_layout: Full width layout
               setting_app_title: Application title
               setting_app_subtitle: Application subtitle

config/locales/fr.yml +1 0

               field_textarea_font: Police utilisée pour les champs texte
               field_updated_by: Mise à jour par
               field_last_updated_by: Dernière mise à jour par
+              field_full_width_layout: Afficher sur toute la largeur
               setting_app_title: Titre de l'application
               setting_app_subtitle: Sous-titre de l'application

lib/redmine/field_format.rb +1 -1

                     CustomField.store_accessor :format_store, *args
                   end
-                  field_attributes :url_pattern
+                  field_attributes :url_pattern, :full_width_layout
                   def name
                     self.class.format_name

public/stylesheets/application.css +2 -2

             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 .attributes .attribute {padding-left:180px; clear:left; min-height: 1.8em;}
-            div.issue .attribute .label {width: 170px; margin-left:-180px; font-weight:bold; float:left; overflow:hidden; text-overflow: ellipsis;}
+            div.issue .attributes .attribute .label {width: 170px; margin-left:-180px; font-weight:bold; float:left;  overflow:hidden; text-overflow: ellipsis;}
             div.issue .attribute .value {overflow:hidden; text-overflow: ellipsis;}
             div.issue.overdue .due-date .value { color: #c22; }

test/functional/custom_fields_controller_test.rb +14 0

@@ -126,6 +126,20 class CustomFieldsControllerTest < Redmine::ControllerTest
126	assert_select '[name=?]', 'custom_field[default_value]', 0	126	assert_select '[name=?]', 'custom_field[default_value]', 0
127	end	127	end
128		128
		129	def test_setting_full_width_layout_shoul_be_present_only_for_long_text_issue_custom_field
		130	get :new, :type => 'IssueCustomField', :custom_field => {:field_format => 'text'}
		131	assert_response :success
		132	assert_select '[name=?]', 'custom_field[full_width_layout]'
		133
		134	get :new, :type => 'IssueCustomField', :custom_field => {:field_format => 'list'}
		135	assert_response :success
		136	assert_select '[name=?]', 'custom_field[full_width_layout]', 0
		137
		138	get :new, :type => 'TimeEntryCustomField', :custom_field => {:field_format => 'text'}
		139	assert_response :success
		140	assert_select '[name=?]', 'custom_field[full_width_layout]', 0
		141	end
		142
129	def test_new_js	143	def test_new_js
130	xhr :get, :new, :type => 'IssueCustomField', :custom_field => {:field_format => 'list'}, :format => 'js'	144	xhr :get, :new, :type => 'IssueCustomField', :custom_field => {:field_format => 'list'}, :format => 'js'
131	assert_response :success	145	assert_response :success

test/functional/issues_controller_test.rb +56 -37

                   str_big5  = "\xa4@\xa4\xeb".force_encoding('Big5')
                   issue = Issue.generate!(:subject => str_utf8)
                   get :index, :project_id => 1,
                               :f => ['subject'],
                               :op => '=', :values => [str_utf8],
                               :format => 'csv'
                   assert_equal 'text/csv; header=present', @response.content_type
                   str_utf8  = "\xe4\xbb\xa5\xe5\x86\x85".force_encoding('UTF-8')
                   issue = Issue.generate!(:subject => str_utf8)
                   get :index, :project_id => 1,
                               :f => ['subject'],
                               :op => '=', :values => [str_utf8],
                               :c => ['status', 'subject'],
                               :format => 'csv',
                   str1  = "test_index_csv_tw"
                   issue = Issue.generate!(:subject => str1, :estimated_hours => '1234.5')
                   get :index, :project_id => 1,
                               :f => ['subject'],
                               :op => '=', :values => [str1],
                               :c => ['estimated_hours', 'subject'],
                               :format => 'csv',
                   str1  = "test_index_csv_fr"
                   issue = Issue.generate!(:subject => str1, :estimated_hours => '1234.5')
                   get :index, :project_id => 1,
                               :f => ['subject'],
                               :op => '=', :values => [str1],
                               :c => ['estimated_hours', 'subject'],
                               :format => 'csv',
                   assert_response :success
                 end
               end
               def test_index_sort_by_assigned_to
                 get :index, :sort => 'assigned_to'
                 assert_response :success
                 assignees = issues_in_list.map(&:assigned_to).compact
                 assert_equal assignees.sort, assignees
                 assert_select 'table.issues.sort-by-assigned-to.sort-asc'
               end
               def test_index_sort_by_assigned_to_desc
                 get :index, :sort => 'assigned_to:desc'
                 assert_response :success
                 assignees = issues_in_list.map(&:assigned_to).compact
                 assert_equal assignees.sort.reverse, assignees
                 assert_select 'table.issues.sort-by-assigned-to.sort-desc'
               end
               def test_index_group_by_assigned_to
                 get :index, :group_by => 'assigned_to', :sort => 'priority'
                 assert_response :success
               end
               def test_index_sort_by_author
                 get :index, :sort => 'author', :c => ['author']
                 assert_response :success
                 authors = issues_in_list.map(&:author)
                 assert_equal authors.sort, authors
               end
               def test_index_sort_by_author_desc
                 get :index, :sort => 'author:desc'
                 assert_response :success
                 authors = issues_in_list.map(&:author)
                 assert_equal authors.sort.reverse, authors
               end
               def test_index_group_by_author
                 get :index, :group_by => 'author', :sort => 'priority'
                 assert_response :success
               end
               def test_index_sort_by_spent_hours
                 get :index, :sort => 'spent_hours:desc'
                 assert_response :success
                 hours = issues_in_list.map(&:spent_hours)
                 assert_equal hours.sort.reverse, hours
               end
               def test_index_sort_by_total_spent_hours
                 get :index, :sort => 'total_spent_hours:desc'
                 assert_response :success
                 hours = issues_in_list.map(&:total_spent_hours)
                 assert_equal hours.sort.reverse, hours
               end
               def test_index_sort_by_total_estimated_hours
                 get :index, :sort => 'total_estimated_hours:desc'
                 assert_response :success
               def test_index_should_not_include_new_issue_tab_for_project_without_trackers
                 with_settings :new_item_menu_tab => '1' do
                   Project.find(1).trackers.clear
                   @request.session[:user_id] = 2
                   get :index, :project_id => 1
                   assert_select '#main-menu a.new-issue', 0
                   role = Role.find(1)
                   role.remove_permission! :add_issues
                   role.add_permission! :copy_issues
                   @request.session[:user_id] = 2
                   get :index, :project_id => 1
                   assert_select '#main-menu a.new-issue', 0
               def test_show_should_display_prev_next_links_with_query_and_sort_on_association
                 @request.session[:issue_query] = {:filters => {'status_id' => {:values => [''], :operator => 'o'}}, :project_id => nil}
                 %w(project tracker status priority author assigned_to category fixed_version).each do |assoc_sort|
                   @request.session['issues_index_sort'] = assoc_sort
                 assert_select ".cf_1 .value", :text => 'MySQL, Oracle'
               end
+              def test_show_with_full_width_layout_custom_field_should_show_field_under_description
+                field = IssueCustomField.create!(:name => 'Long text', :field_format => 'text', :full_width_layout => '1',
+                  :tracker_ids => [1], :is_for_all => true)
+                issue = Issue.find(1)
+                issue.custom_field_values = {field.id => 'This is a long text'}
+                issue.save!
+                get :show, :id => 1
+                assert_response :success
+                # long text custom field should not be render in the attributes div
+                assert_select "div.attributes div.attribute.cf_#{field.id} p strong", 0, :text => 'Long text'
+                assert_select "div.attributes div.attribute.cf_#{field.id} div.value", 0, :text => 'This is a long text'
+                # long text custom field should be render under description field
+                assert_select "div.description ~ div.attribute.cf_#{field.id} p strong", :text => 'Long text'
+                assert_select "div.description ~ div.attribute.cf_#{field.id} div.value", :text => 'This is a long text'
+              end
               def test_show_with_multi_user_custom_field
                 field = IssueCustomField.create!(:name => 'Multi user', :field_format => 'user', :multiple => true,
                   :tracker_ids => [1], :is_for_all => true)
               end
               def test_show_export_to_pdf
                 issue = Issue.find(3)
                 assert issue.relations.select{|r| r.other_issue(issue).visible?}.present?
                 get :show, :id => 3, :format => 'pdf'
                 assert_response :success
                 get :new, :project_id => 'invalid'
                 assert_response 404
               end
               def test_new_with_parent_id_should_only_propose_valid_trackers
                 @request.session[:user_id] = 2
                 t = Tracker.find(3)
                                           :custom_field_values => {'2' => 'Value for field 2'}}
                   end
                   assert_redirected_to :controller => 'issues', :action => 'show', :id => Issue.last.id
                   assert_equal 1, ActionMailer::Base.deliveries.size
                 end
               end
                     assert_select 'option[value="1"][selected=selected]', :text => 'eCookbook'
                     assert_select 'option[value="2"]:not([selected])', :text => 'OnlineStore'
                   end
                   assert_select 'input[name=?][value=?]', 'issue[subject]', orig.subject
                   assert_select 'input[name=copy_from][value="1"]'
                 end
               end
               def test_get_edit_should_display_the_time_entry_form_with_log_time_permission
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').update_attribute :permissions, [:view_issues, :edit_issues, :log_time]
                 get :edit, :id => 1
                 assert_select 'input[name=?]', 'time_entry[hours]'
               end
               def test_get_edit_should_not_display_the_time_entry_form_without_log_time_permission
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').remove_permission! :log_time
                 get :edit, :id => 1
                 assert_select 'input[name=?]', 'time_entry[hours]', 0
               end
                 assert_response :redirect
                 assert_redirected_to :controller => 'issues', :action => 'show', :id => issue.id
               end
               def test_put_update_should_redirect_with_previous_and_next_issue_ids_params
                 @request.session[:user_id] = 2
                   assert_select 'select[name=?]', 'issue[project_id]'
                   assert_select 'input[name=?]', 'issue[parent_issue_id]'
                   # Project specific custom field, date type
                   field = CustomField.find(9)
                   assert !field.is_for_all?
                   assert_equal 'date', field.field_format
                   assert_select 'input[name=?]', 'issue[custom_field_values][9]'
                   # System wide custom field
                   assert CustomField.find(1).is_for_all?
                   assert_select 'select[name=?]', 'issue[custom_field_values][1]'
                   # Be sure we don't display inactive IssuePriorities
                   assert ! IssuePriority.find(15).active?
                   assert_select 'select[name=?]', 'issue[priority_id]' do
                                                    :issue => {:priority_id => '',
                                                               :assigned_to_id => group.id,
                                                               :custom_field_values => {'2' => ''}}
                   assert_response 302
                   assert_equal [group, group], Issue.where(:id => [1, 2]).collect {|i| i.assigned_to}
                 end
                   assert_select 'option[value="2"]'
                 end
               end
               def test_bulk_copy_to_another_project
                 @request.session[:user_id] = 2
                 assert_difference 'Issue.count', 2 do
                                 :assigned_to_id => 2)
                 ]
                 assert_difference 'Issue.count', issues.size do
                   post :bulk_update, :ids => issues.map(&:id), :copy => '1',
                        :issue => {
                          :project_id => '', :tracker_id => '', :assigned_to_id => '',
                          :status_id => '', :start_date => '', :due_date => ''
                 @request.session[:user_id] = 2
                 assert_difference 'Issue.count', 2 do
                   assert_no_difference 'Project.find(1).issues.count' do
                     post :bulk_update, :ids => [1, 2], :copy => '1',
                          :issue => {
                            :project_id => '2', :tracker_id => '', :assigned_to_id => '2',
                            :status_id => '1', :start_date => '2009-12-01', :due_date => '2009-12-31'

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