dinislage/redmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some merge bugs. #4077

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2952 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis
2009-10-21 22:35:03 +00:00
parent 2e0cbd2840
commit ff3d0fe4db
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/helpers/custom_fields_helper.rb
+3 -3
View File
@@ -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
app/models/time_entry_activity_custom_field.rb
+1 -1
View File
@@ -17,7 +17,7 @@
class TimeEntryActivityCustomField < CustomField
def type_name
:enumeration_time_entry_activities
:enumeration_activities
end
end
app/views/enumerations/list.rhtml
+2 -2
View File
@@ -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 },