kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed some merge bugs. #4077 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/custom_fields_helper.rb
View File

@ -23,9 +23,9 @@ module CustomFieldsHelper
{:name => 'ProjectCustomField', :partial => 'custom_fields/index', :label => :label_project_plural}, {:name => 'ProjectCustomField', :partial => 'custom_fields/index', :label => :label_project_plural},
{:name => 'UserCustomField', :partial => 'custom_fields/index', :label => :label_user_plural}, {:name => 'UserCustomField', :partial => 'custom_fields/index', :label => :label_user_plural},
{:name => 'GroupCustomField', :partial => 'custom_fields/index', :label => :label_group_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 end

2
app/models/time_entry_activity_custom_field.rb
View File

@ -17,7 +17,7 @@
class TimeEntryActivityCustomField < CustomField class TimeEntryActivityCustomField < CustomField
def type_name def type_name
:enumeration_time_entry_activities :enumeration_activities
end end
end end

4
app/views/enumerations/list.rhtml
View File

@ -16,8 +16,8 @@
<% enumerations.each do |enumeration| %> <% enumerations.each do |enumeration| %>
<tr class="<%= cycle('odd', 'even') %>"> <tr class="<%= cycle('odd', 'even') %>">
<td><%= link_to h(enumeration), :action => 'edit', :id => enumeration %></td> <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 style="width:15%;"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}) %></td>
<td class="buttons"> <td class="buttons">
<%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration }, <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration },

2
public/stylesheets/application.css
View File

@ -159,6 +159,8 @@ table.attributes { width: 100% }
table.attributes th { vertical-align: top; text-align: left; } table.attributes th { vertical-align: top; text-align: left; }
table.attributes td { vertical-align: top; } table.attributes td { vertical-align: top; }
td.center {text-align:center;}
.highlight { background-color: #FCFD8D;} .highlight { background-color: #FCFD8D;}
.highlight.token-1 { background-color: #faa;} .highlight.token-1 { background-color: #faa;}
.highlight.token-2 { background-color: #afa;} .highlight.token-2 { background-color: #afa;}

4
test/fixtures/custom_values.yml vendored
View File

@ -84,7 +84,7 @@ custom_values_014:
id: 14 id: 14
value: "-7.6" value: "-7.6"
custom_values_015: custom_values_015:
customized_type: TimeEntryActivity customized_type: Enumeration
custom_field_id: 7 custom_field_id: 7
customized_id: 10 customized_id: 10
id: 15 id: 15
@ -94,4 +94,4 @@ custom_values_016:
custom_field_id: 7 custom_field_id: 7
customized_id: 11 customized_id: 11
id: 16 id: 16
value: true value: '1'