jro_apps/redmine Commit - r1730:237a3f52a2d9

Fixes custom fields display order at several places (#1768)....

Jean-Philippe Lang -

r1730:237a3f52a2d9

parent child

Context file:

r1730:237a3f52a2d9

app/controllers/account_controller.rb +1 -1

               # Show user's account
               def show
                 @user = User.find_active(params[:id])
-                @custom_values = @user.custom_values.find(:all, :include => :custom_field)
+                @custom_values = @user.custom_values
                 # show only public projects and private projects that the logged in user is also a member of
                 @memberships = @user.memberships.select do |membership|

app/models/custom_field.rb +1 -1

               # to move in project_custom_field
               def self.for_all
-                find(:all, :conditions => ["is_for_all=?", true])
+                find(:all, :conditions => ["is_for_all=?", true], :order => 'position')
               end
               def type_name

app/models/project.rb +1 -1

               # Returns an array of all custom fields enabled for project issues
               # (explictly associated custom fields and custom fields enabled for all projects)
               def all_issue_custom_fields
-                @all_issue_custom_fields ||= (IssueCustomField.for_all + issue_custom_fields).uniq
+                @all_issue_custom_fields ||= (IssueCustomField.for_all + issue_custom_fields).uniq.sort
               end
               def project

app/views/issues/_form.rhtml +1 -1

             </div>
             <div style="clear:both;"> </div>
-            <%= render :partial => 'form_custom_fields', :locals => {:values => @custom_values} %>
+            <%= render :partial => 'form_custom_fields' %>
             <% if @issue.new_record? %>
             <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>

app/views/issues/_form_custom_fields.rhtml +1 -1

             <div class="splitcontentleft">
-            <% i = 1 %>
+            <% i = 0 %>
             <% split_on = @issue.custom_field_values.size / 2 %>
             <% @issue.custom_field_values.each do |value| %>
             	<p><%= custom_field_tag_with_label :issue, value %></p>

test/functional/issues_controller_test.rb +1 -1

                 assert_equal 2, issue.author_id
                 assert_equal 3, issue.tracker_id
                 assert_nil issue.estimated_hours
-                v = issue.custom_values.find_by_custom_field_id(2)
+                v = issue.custom_values.find(:first, :conditions => {:custom_field_id => 2})
                 assert_not_nil v
                 assert_equal 'Value for field 2', v.value
               end

vendor/plugins/acts_as_customizable/lib/acts_as_customizable.rb +4 -1

                       return if self.included_modules.include?(Redmine::Acts::Customizable::InstanceMethods)
                       cattr_accessor :customizable_options
                       self.customizable_options = options
-                      has_many :custom_values, :dependent => :delete_all, :as => :customized
+                      has_many :custom_values, :as => :customized,
+                                               :include => :custom_field,
+                                               :order => "#{CustomField.table_name}.position",
+                                               :dependent => :delete_all
                       before_validation_on_create { |customized| customized.custom_field_values }
                       # Trigger validation only if custom values were changed
                       validates_associated :custom_values, :on => :update, :if => Proc.new { |customized| customized.custom_field_values_changed? }

General Comments 0

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

No TODOs yet

	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