Fixed some merge bugs. #4077

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

diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb
index 2545dd893ba11e654aaf5630f1e2a3b6f41e6fd9..13348546b2875b4bc80b75cef14b83a0286205fb 100644 (file)
--- 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 => 'IssuePriorityCustomField', :label => IssuePriority::OptionName},
-            {:name => 'DocumentCategoryCustomField', :label => DocumentCategory::OptionName}
+            {:name => 'TimeEntryActivityCustomField', :partial => 'custom_fields/index', :label => TimeEntryActivity::OptionName},
+            {:name => 'IssuePriorityCustomField', :partial => 'custom_fields/index', :label => IssuePriority::OptionName},
+            {:name => 'DocumentCategoryCustomField', :partial => 'custom_fields/index', :label => DocumentCategory::OptionName}
             ]
   end
   

diff --git a/app/models/time_entry_activity_custom_field.rb b/app/models/time_entry_activity_custom_field.rb
index 149bbb5c846238c664cf43c0cf7fcf13f1fa0302..34f211aa0036b03d0b327345c61391ba7b6dc3e2 100644 (file)
--- 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
 

diff --git a/app/views/enumerations/list.rhtml b/app/views/enumerations/list.rhtml
index 817751ab2c9a38d96e3c45affb5714bcfc98d0de..13e1b6bb80cf819be6731ab8a6762b790487d5fb 100644 (file)
--- 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 style="width:15%;"><%= image_tag('true.png') if enumeration.active? %></td>
+    <td class="center" style="width:15%;"><%= image_tag('true.png') if enumeration.is_default? %></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 }, 

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 61f039b0476dc1b7fc787e0d9bcf61953de7ddee..1ad81f0795f8fec11fa3a1ca6d3df457af1190ac 100644 (file)
--- 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;}

diff --git a/test/fixtures/custom_values.yml b/test/fixtures/custom_values.yml
index 155191bec695f98a14bac500049a620cab8af201..7c4ce4794dda5b4677ec92e748951aacdc5fe3bd 100644 (file)
--- 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'