git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10554 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/2.2.0
@@ -20,16 +20,7 @@ | |||
module CustomFieldsHelper | |||
def custom_fields_tabs | |||
tabs = [{:name => 'IssueCustomField', :partial => 'custom_fields/index', :label => :label_issue_plural}, | |||
{:name => 'TimeEntryCustomField', :partial => 'custom_fields/index', :label => :label_spent_time}, | |||
{:name => 'ProjectCustomField', :partial => 'custom_fields/index', :label => :label_project_plural}, | |||
{:name => 'VersionCustomField', :partial => 'custom_fields/index', :label => :label_version_plural}, | |||
{:name => 'UserCustomField', :partial => 'custom_fields/index', :label => :label_user_plural}, | |||
{:name => 'GroupCustomField', :partial => 'custom_fields/index', :label => :label_group_plural}, | |||
{: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} | |||
] | |||
CustomField::CUSTOM_FIELDS_TABS | |||
end | |||
# Return custom field html tag corresponding to its format |
@@ -30,6 +30,27 @@ class CustomField < ActiveRecord::Base | |||
validate :validate_custom_field | |||
before_validation :set_searchable | |||
CUSTOM_FIELDS_TABS = [ | |||
{:name => 'IssueCustomField', :partial => 'custom_fields/index', | |||
:label => :label_issue_plural}, | |||
{:name => 'TimeEntryCustomField', :partial => 'custom_fields/index', | |||
:label => :label_spent_time}, | |||
{:name => 'ProjectCustomField', :partial => 'custom_fields/index', | |||
:label => :label_project_plural}, | |||
{:name => 'VersionCustomField', :partial => 'custom_fields/index', | |||
:label => :label_version_plural}, | |||
{:name => 'UserCustomField', :partial => 'custom_fields/index', | |||
:label => :label_user_plural}, | |||
{:name => 'GroupCustomField', :partial => 'custom_fields/index', | |||
:label => :label_group_plural}, | |||
{: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} | |||
] | |||
def set_searchable | |||
# make sure these fields are not searchable | |||
self.searchable = false if %w(int float date bool).include?(field_format) |