jro_apps/redmine Commit - r1072:0b4a02f607a1

Display custom fields in two columns on the issue form....

Jean-Philippe Lang -

r1072:0b4a02f607a1

parent child

Context file:

r1072:0b4a02f607a1

Collapse all files

app/views/issues/_form_custom_fields.rhtml created 644 +9 0

@@ -0,0 +1,9
	1	<div class="splitcontentleft">
	2	<% values.each_with_index do \|value, i\| %>
	3	<p><%= custom_field_tag_with_label value %></p>
	4	<% if i >= values.size / 2 - 1 %>
	5	</div><div class="splitcontentright">
	6	<% end %>
	7	<% end %>
	8	</div>
	9	<div style="clear:both;"> </div>

app/helpers/custom_fields_helper.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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 CustomFieldsHelper
               # Return custom field html tag corresponding to its format
               def custom_field_tag(custom_value)
                 custom_field = custom_value.custom_field
                 field_name = "custom_fields[#{custom_field.id}]"
                 field_id = "custom_fields_#{custom_field.id}"
                 case custom_field.field_format
                 when "date"
                   text_field('custom_value', 'value', :name => field_name, :id => field_id, :size => 10) +
                   calendar_for(field_id)
                 when "text"
-                  text_area 'custom_value', 'value', :name => field_name, :id => field_id, :cols => 60, :rows => 3
+                  text_area 'custom_value', 'value', :name => field_name, :id => field_id, :rows => 3, :style => 'width:99%'
                 when "bool"
                   check_box 'custom_value', 'value', :name => field_name, :id => field_id
                 when "list"
                   select 'custom_value', 'value', custom_field.possible_values, { :include_blank => true }, :name => field_name, :id => field_id
                 else
                   text_field 'custom_value', 'value', :name => field_name, :id => field_id
                 end
               end
               # Return custom field label tag
               def custom_field_label_tag(custom_value)
                 content_tag "label", custom_value.custom_field.name +
             	(custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""),
             	:for => "custom_fields_#{custom_value.custom_field.id}",
             	:class => (custom_value.errors.empty? ? nil : "error" )
               end
               # Return custom field tag with its label tag
               def custom_field_tag_with_label(custom_value)
                 custom_field_label_tag(custom_value) + custom_field_tag(custom_value)
               end
               # Return a string used to display a custom value
               def show_value(custom_value)
                 return "" unless custom_value
                 format_value(custom_value.value, custom_value.custom_field.field_format)
               end
               # Return a string used to display a custom value
               def format_value(value, field_format)
                 return "" unless value && !value.empty?
                 case field_format
                 when "date"
                   begin; format_date(value.to_date); rescue; value end
                 when "bool"
                   l_YesNo(value == "1")
                 else
                   value
                 end
               end
               # Return an array of custom field formats which can be used in select_tag
               def custom_field_formats_for_select
                 CustomField::FIELD_FORMATS.sort {|a,b| a[1][:order]<=>b[1][:order]}.collect { |k| [ l(k[1][:name]), k[0] ] }
               end
             end

app/views/issues/_form.rhtml +2 -3

             <%= error_messages_for 'issue' %>
             <div class="box">
             <% if @issue.new_record? %>
             <p><%= f.select :tracker_id, @project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p>
             <%= observe_field :issue_tracker_id, :url => { :action => :new },
                                                  :update => :content,
                                                  :with => "Form.serialize('issue-form')" %>
             <% end %>
             <div class="splitcontentleft">
             <% if @issue.new_record? %>
             <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
             <% else %>
             <p><label><%= l(:field_status) %></label> <%= @issue.status.name %></p>
             <% end %>
             <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %></p>
             <p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p>
             <p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %>
             <%= prompt_to_remote(l(:label_issue_category_new),
                                  l(:label_issue_category_new), 'category[name]',
                                  {:controller => 'projects', :action => 'add_issue_category', :id => @project},
                                  :class => 'small') if authorize_for('projects', 'add_issue_category') %></p>
             </div>
             <div class="splitcontentright">
             <p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %></p>
             <p><%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %></p>
             <p><%= f.text_field :estimated_hours, :size => 3 %> <%= l(:field_hours) %></p>
             <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
             </div>
             <p><%= f.text_field :subject, :size => 80, :required => true %></p>
             <p><%= f.text_area :description, :required => true,
                                :cols => 60,
                                :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
                                :accesskey => accesskey(:edit),
                                :class => 'wiki-edit' %></p>
             <p><%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
-            <% for @custom_value in @custom_values %>
-            	<p><%= custom_field_tag_with_label @custom_value %></p>
+            <%= render :partial => 'form_custom_fields', :locals => {:values => @custom_values} %>
-            <% end %>
             <% if @issue.new_record? %>
             <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
             <%= image_to_function "add.png", "addFileField();return false" %></label>
             <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
             <% end %>
             </div>
             <%= wikitoolbar_for 'issue_description' %>
             <% content_for :header_tags do %>
                 <%= javascript_include_tag 'calendar/calendar' %>
                 <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
                 <%= javascript_include_tag 'calendar/calendar-setup' %>
                 <%= stylesheet_link_tag 'calendar' %>
             <% end %>

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