jro_apps/redmine Commit - r2838:ff3d0fe4db01

Fixed some merge bugs. #4077...

Eric Davis -

r2838:ff3d0fe4db01

parent child

Context file:

r2838:ff3d0fe4db01

app/helpers/custom_fields_helper.rb +3 -3

                         {:name => 'ProjectCustomField', :partial => 'custom_fields/index', :label => :label_project_plural},
                         {:name => 'UserCustomField', :partial => 'custom_fields/index', :label => :label_user_plural},
                         {:name => 'GroupCustomField', :partial => 'custom_fields/index', :label => :label_group_plural},
-                        {:name => 'TimeEntryActivityCustomField', :label => TimeEntryActivity::OptionName},
+                        {:name => 'TimeEntryActivityCustomField', :partial => 'custom_fields/index', :label => TimeEntryActivity::OptionName},
-                        {:name => 'IssuePriorityCustomField', :label => IssuePriority::OptionName},
+                        {:name => 'IssuePriorityCustomField', :partial => 'custom_fields/index', :label => IssuePriority::OptionName},
-                        {:name => 'DocumentCategoryCustomField', :label => DocumentCategory::OptionName}
+                        {:name => 'DocumentCategoryCustomField', :partial => 'custom_fields/index', :label => DocumentCategory::OptionName}
                         ]
               end

app/models/time_entry_activity_custom_field.rb +1 -1

             class TimeEntryActivityCustomField < CustomField
               def type_name
-                :enumeration_time_entry_activities
+                :enumeration_activities
               end
             end

app/views/enumerations/list.rhtml +2 -2

             <% enumerations.each do |enumeration| %>
             <tr class="<%= cycle('odd', 'even') %>">
                 <td><%= link_to h(enumeration), :action => 'edit', :id => enumeration %></td>
-                <td style="width:15%;"><%= image_tag('true.png') if enumeration.is_default? %></td>
+                <td class="center" style="width:15%;"><%= image_tag('true.png') if enumeration.is_default? %></td>
-                <td style="width:15%;"><%= image_tag('true.png') if enumeration.active? %></td>
+                <td class="center" style="width:15%;"><%= image_tag('true.png') if enumeration.active? %></td>
                 <td style="width:15%;"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}) %></td>
                 <td class="buttons">
                 <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration },

public/stylesheets/application.css +2 0

             table.attributes th { vertical-align: top; text-align: left; }
             table.attributes td { vertical-align: top; }
+            td.center {text-align:center;}
             .highlight { background-color: #FCFD8D;}
             .highlight.token-1 { background-color: #faa;}
             .highlight.token-2 { background-color: #afa;}

test/fixtures/custom_values.yml +2 -2

               id: 14
               value: "-7.6"
             custom_values_015:
-              customized_type: TimeEntryActivity
+              customized_type: Enumeration
               custom_field_id: 7
               customized_id: 10
               id: 15
               custom_field_id: 7
               customized_id: 11
               id: 16
-              value: true
+              value: '1'

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