jro_apps/redmine Commit - r15869:b40d66f39fa8

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 +19 0

@@ -1575,6 +1575,25 class IssuesControllerTest < Redmine::ControllerTest
1575	assert_select ".cf_1 .value", :text => 'MySQL, Oracle'	1575	assert_select ".cf_1 .value", :text => 'MySQL, Oracle'
1576	end	1576	end
1577		1577
		1578	def test_show_with_full_width_layout_custom_field_should_show_field_under_description
		1579	field = IssueCustomField.create!(:name => 'Long text', :field_format => 'text', :full_width_layout => '1',
		1580	:tracker_ids => [1], :is_for_all => true)
		1581	issue = Issue.find(1)
		1582	issue.custom_field_values = {field.id => 'This is a long text'}
		1583	issue.save!
		1584
		1585	get :show, :id => 1
		1586	assert_response :success
		1587
		1588	# long text custom field should not be render in the attributes div
		1589	assert_select "div.attributes div.attribute.cf_#{field.id} p strong", 0, :text => 'Long text'
		1590	assert_select "div.attributes div.attribute.cf_#{field.id} div.value", 0, :text => 'This is a long text'
		1591
		1592	# long text custom field should be render under description field
		1593	assert_select "div.description ~ div.attribute.cf_#{field.id} p strong", :text => 'Long text'
		1594	assert_select "div.description ~ div.attribute.cf_#{field.id} div.value", :text => 'This is a long text'
		1595	end
		1596
1578	def test_show_with_multi_user_custom_field	1597	def test_show_with_multi_user_custom_field
1579	field = IssueCustomField.create!(:name => 'Multi user', :field_format => 'user', :multiple => true,	1598	field = IssueCustomField.create!(:name => 'Multi user', :field_format => 'user', :multiple => true,
1580	:tracker_ids => [1], :is_for_all => true)	1599	:tracker_ids => [1], :is_for_all => true)

	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