##// END OF EJS Templates
jro_apps » redmine
RSS
Fixed some merge bugs. #4077...
Eric Davis -
r2838:ff3d0fe4db01
parent child
Show More
Side by Side Unified
Context file:
r2838:ff3d0fe4db01 Loading diff...:
Show file before | Show file after | Hide comments
@@ -23,9 +23,9 module CustomFieldsHelper
23 23 {:name => 'ProjectCustomField', :partial => 'custom_fields/index', :label => :label_project_plural},
24 24 {:name => 'UserCustomField', :partial => 'custom_fields/index', :label => :label_user_plural},
25 25 {:name => 'GroupCustomField', :partial => 'custom_fields/index', :label => :label_group_plural},
26 {:name => 'TimeEntryActivityCustomField', :label => TimeEntryActivity::OptionName},
27 {:name => 'IssuePriorityCustomField', :label => IssuePriority::OptionName},
28 {:name => 'DocumentCategoryCustomField', :label => DocumentCategory::OptionName}
26 {:name => 'TimeEntryActivityCustomField', :partial => 'custom_fields/index', :label => TimeEntryActivity::OptionName},
27 {:name => 'IssuePriorityCustomField', :partial => 'custom_fields/index', :label => IssuePriority::OptionName},
28 {:name => 'DocumentCategoryCustomField', :partial => 'custom_fields/index', :label => DocumentCategory::OptionName}
29 29 ]
30 30 end
31 31
Show file before | Show file after | Hide comments
@@ -17,7 +17,7
17 17
18 18 class TimeEntryActivityCustomField < CustomField
19 19 def type_name
20 :enumeration_time_entry_activities
20 :enumeration_activities
21 21 end
22 22 end
23 23
Show file before | Show file after | Hide comments
@@ -16,8 +16,8
16 16 <% enumerations.each do |enumeration| %>
17 17 <tr class="<%= cycle('odd', 'even') %>">
18 18 <td><%= link_to h(enumeration), :action => 'edit', :id => enumeration %></td>
19 <td style="width:15%;"><%= image_tag('true.png') if enumeration.is_default? %></td>
20 <td style="width:15%;"><%= image_tag('true.png') if enumeration.active? %></td>
19 <td class="center" style="width:15%;"><%= image_tag('true.png') if enumeration.is_default? %></td>
20 <td class="center" style="width:15%;"><%= image_tag('true.png') if enumeration.active? %></td>
21 21 <td style="width:15%;"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}) %></td>
22 22 <td class="buttons">
23 23 <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration },
Show file before | Show file after | Hide comments
@@ -159,6 +159,8 table.attributes { width: 100% }
159 159 table.attributes th { vertical-align: top; text-align: left; }
160 160 table.attributes td { vertical-align: top; }
161 161
162 td.center {text-align:center;}
163
162 164 .highlight { background-color: #FCFD8D;}
163 165 .highlight.token-1 { background-color: #faa;}
164 166 .highlight.token-2 { background-color: #afa;}
Show file before | Show file after | Hide comments
@@ -84,7 +84,7 custom_values_014:
84 84 id: 14
85 85 value: "-7.6"
86 86 custom_values_015:
87 customized_type: TimeEntryActivity
87 customized_type: Enumeration
88 88 custom_field_id: 7
89 89 customized_id: 10
90 90 id: 15
@@ -94,4 +94,4 custom_values_016:
94 94 custom_field_id: 7
95 95 customized_id: 11
96 96 id: 16
97 value: true
97 value: '1'
General Comments 0
You need to be logged in to leave comments. Login now