Fixed some merge bugs. #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2952 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed some merge bugs. #4077
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2952 e93f8b46-1217-0410-a6f0-8f06a7374b81
ff3d0fe4 · Eric Davis · 2e0cbd28 · ff3d0fe4 · ff3d0fe4 · ff3d0fe4
Commit ff3d0fe4 authored Oct 21, 2009 by Eric Davis
5 changed files
--- a/app/helpers/custom_fields_helper.rb
+++ b/app/helpers/custom_fields_helper.rb
@@ -23,9 +23,9 @@ module CustomFieldsHelper
            {: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

--- a/app/models/time_entry_activity_custom_field.rb
+++ b/app/models/time_entry_activity_custom_field.rb
@@ -17,7 +17,7 @@
 class TimeEntryActivityCustomField < CustomField
  def type_name
-    :enumeration_time_entry_activities
+    :enumeration_activities
  end
 end
--- a/app/views/enumerations/list.rhtml
+++ b/app/views/enumerations/list.rhtml
@@ -16,8 +16,8 @@
 <% 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 }, 

--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -159,6 +159,8 @@ table.attributes { width: 100% }
 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;}

--- a/test/fixtures/custom_values.yml
+++ b/test/fixtures/custom_values.yml
@@ -84,7 +84,7 @@ custom_values_014:
  id: 14
  value: "-7.6"
 custom_values_015: 
-  customized_type: TimeEntryActivity
+  customized_type: Enumeration
  custom_field_id: 7
  customized_id: 10
  id: 15
@@ -94,4 +94,4 @@ custom_values_016:
  custom_field_id: 7
  customized_id: 11
  id: 16
-  value: true
+  value: '1'