diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2009-10-21 22:35:03 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2009-10-21 22:35:03 +0000 |
| commit | ff3d0fe4db014885de3497931b4b98fad0cafac1 (patch) | |
| tree | f20ded2d238b57e71ed59407aec49b645f6fd5e9 /app/helpers | |
| parent | 2e0cbd2840ffb9fdb355ed0afd6b8684f2549bc7 (diff) | |
| download | redmine-ff3d0fe4db014885de3497931b4b98fad0cafac1.tar.gz redmine-ff3d0fe4db014885de3497931b4b98fad0cafac1.zip | |
Fixed some merge bugs. #4077
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2952 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/custom_fields_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb index 2545dd893..13348546b 100644 --- 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 |