end
def edit
- @categories = Enumeration::get_values('DCAT')
+ @categories = Enumeration.document_categories
if request.post? and @document.update_attributes(params[:document])
flash[:notice] = l(:notice_successful_update)
redirect_to :action => 'show', :id => @document
redirect_to :action => 'index'
end
end
- @enumerations = Enumeration.get_values(@enumeration.opt) - [@enumeration]
+ @enumerations = Enumeration.values(@enumeration.opt) - [@enumeration]
#rescue
# flash[:error] = 'Unable to delete enumeration'
# redirect_to :action => 'index'
@journals.reverse! if User.current.wants_comments_in_reverse_order?
@allowed_statuses = @issue.new_statuses_allowed_to(User.current)
@edit_allowed = User.current.allowed_to?(:edit_issues, @project)
- @priorities = Enumeration::get_values('IPRI')
+ @priorities = Enumeration.priorities
@time_entry = TimeEntry.new
respond_to do |format|
format.html { render :template => 'issues/show.rhtml' }
return
end
end
- @priorities = Enumeration::get_values('IPRI')
+ @priorities = Enumeration.priorities
render :layout => !request.xhr?
end
def edit
@allowed_statuses = @issue.new_statuses_allowed_to(User.current)
- @priorities = Enumeration::get_values('IPRI')
+ @priorities = Enumeration.priorities
@edit_allowed = User.current.allowed_to?(:edit_issues, @project)
@time_entry = TimeEntry.new
@assignables << @issue.assigned_to if @issue && @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
end
- @priorities = Enumeration.get_values('IPRI').reverse
+ @priorities = Enumeration.priorities.reverse
@statuses = IssueStatus.find(:all, :order => 'position')
@back = request.env['HTTP_REFERER']
render :template => "reports/issue_report_details"
when "priority"
@field = "priority_id"
- @rows = Enumeration::get_values('IPRI')
+ @rows = Enumeration.priorities
@data = issues_by_priority
@report_title = l(:field_priority)
render :template => "reports/issue_report_details"
else
@trackers = @project.trackers
@versions = @project.versions.sort
- @priorities = Enumeration::get_values('IPRI')
+ @priorities = Enumeration.priorities
@categories = @project.issue_categories
@assignees = @project.members.collect { |m| m.user }
@authors = @project.members.collect { |m| m.user }
end
def activity_collection_for_select_options
- activities = Enumeration::get_values('ACTI')
+ activities = Enumeration.activities
collection = []
collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ] unless activities.detect(&:is_default)
activities.each { |a| collection << [a.name, a.id] }
def after_initialize
if new_record?
- self.category ||= Enumeration.default('DCAT')
+ self.category ||= Enumeration.document_categories.default
end
end
end
# Single table inheritance would be an option
OPTIONS = {
- "IPRI" => {:label => :enumeration_issue_priorities, :model => Issue, :foreign_key => :priority_id},
- "DCAT" => {:label => :enumeration_doc_categories, :model => Document, :foreign_key => :category_id},
- "ACTI" => {:label => :enumeration_activities, :model => TimeEntry, :foreign_key => :activity_id}
+ "IPRI" => {:label => :enumeration_issue_priorities, :model => Issue, :foreign_key => :priority_id, :scope => :priorities},
+ "DCAT" => {:label => :enumeration_doc_categories, :model => Document, :foreign_key => :category_id, :scope => :document_categories},
+ "ACTI" => {:label => :enumeration_activities, :model => TimeEntry, :foreign_key => :activity_id, :scope => :activities}
}.freeze
- def self.get_values(option)
- find(:all, :conditions => {:opt => option}, :order => 'position')
+ # Creates a named scope for each type of value. The scope has a +default+ method
+ # that returns the default value, or nil if no value is set as default.
+ # Example:
+ # Enumeration.priorities
+ # Enumeration.priorities.default
+ OPTIONS.each do |k, v|
+ next unless v[:scope]
+ named_scope v[:scope], :conditions => { :opt => k }, :order => 'position' do
+ def default
+ find(:first, :conditions => { :is_default => true })
+ end
+ end
end
- def self.default(option)
- find(:first, :conditions => {:opt => option, :is_default => true}, :order => 'position')
+ named_scope :values, lambda {|opt| { :conditions => { :opt => opt }, :order => 'position' } } do
+ def default
+ find(:first, :conditions => { :is_default => true })
+ end
end
def option_name
if new_record?
# set default values for new records only
self.status ||= IssueStatus.default
- self.priority ||= Enumeration.default('IPRI')
+ self.priority ||= Enumeration.priorities.default
end
end
def after_initialize
if new_record? && self.activity.nil?
- if default_activity = Enumeration.default('ACTI')
+ if default_activity = Enumeration.activities.default
self.activity_id = default_activity.id
end
end
<div class="box">
<!--[form:document]-->
<p><label for="document_category_id"><%=l(:field_category)%></label>
-<%= select('document', 'category_id', Enumeration.get_values('DCAT').collect {|c| [c.name, c.id]}) %></p>
+<%= select('document', 'category_id', Enumeration.document_categories.collect {|c| [c.name, c.id]}) %></p>
<p><label for="document_title"><%=l(:field_title)%> <span class="required">*</span></label>
<%= text_field 'document', 'title', :size => 60 %></p>
<% Enumeration::OPTIONS.each do |option, params| %>
<h3><%= l(params[:label]) %></h3>
-<% enumerations = Enumeration.get_values(option) %>
+<% enumerations = Enumeration.values(option) %>
<% if enumerations.any? %>
<table class="list">
<% enumerations.each do |enumeration| %>
<%= select_tag('status_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_statuses, :id, :name)) %></label>
<% end %>
<label><%= l(:field_priority) %>:
-<%= select_tag('priority_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(Enumeration.get_values('IPRI'), :id, :name)) %></label>
+<%= select_tag('priority_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(Enumeration.priorities, :id, :name)) %></label>
<label><%= l(:field_category) %>:
<%= select_tag('category_id', content_tag('option', l(:label_no_change_option), :value => '') +
content_tag('option', l(:label_none), :value => 'none') +
90 => closed_status # closed\r
}\r
\r
- priorities = Enumeration.get_values('IPRI')\r
+ priorities = Enumeration.priorities\r
DEFAULT_PRIORITY = priorities[2]\r
PRIORITY_MAPPING = {10 => priorities[1], # none\r
20 => priorities[1], # low\r
'closed' => closed_status
}
- priorities = Enumeration.get_values('IPRI')
+ priorities = Enumeration.priorities
DEFAULT_PRIORITY = priorities[0]
PRIORITY_MAPPING = {'lowest' => priorities[0],
'low' => priorities[0],
:id => 1,
:issue => { :status_id => 2, :assigned_to_id => 3 },
:notes => 'Assigned to dlopper',
- :time_entry => { :hours => '', :comments => '', :activity_id => Enumeration.get_values('ACTI').first }
+ :time_entry => { :hours => '', :comments => '', :activity_id => Enumeration.activities.first }
end
assert_redirected_to :action => 'show', :id => '1'
issue.reload
post :edit,
:id => 1,
:notes => '2.5 hours added',
- :time_entry => { :hours => '2.5', :comments => '', :activity_id => Enumeration.get_values('ACTI').first }
+ :time_entry => { :hours => '2.5', :comments => '', :activity_id => Enumeration.activities.first }
end
assert_redirected_to :action => 'show', :id => '1'
end
def test_default
- e = Enumeration.default('IPRI')
+ e = Enumeration.priorities.default
assert e.is_a?(Enumeration)
assert e.is_default?
assert_equal 'Normal', e.name
def test_create
e = Enumeration.new(:opt => 'IPRI', :name => 'Very urgent', :is_default => false)
assert e.save
- assert_equal 'Normal', Enumeration.default('IPRI').name
+ assert_equal 'Normal', Enumeration.priorities.default.name
end
def test_create_as_default
e = Enumeration.new(:opt => 'IPRI', :name => 'Very urgent', :is_default => true)
assert e.save
- assert_equal e, Enumeration.default('IPRI')
+ assert_equal e, Enumeration.priorities.default
end
def test_update_default
- e = Enumeration.default('IPRI')
+ e = Enumeration.priorities.default
e.update_attributes(:name => 'Changed', :is_default => true)
- assert_equal e, Enumeration.default('IPRI')
+ assert_equal e, Enumeration.priorities.default
end
def test_update_default_to_non_default
- e = Enumeration.default('IPRI')
+ e = Enumeration.priorities.default
e.update_attributes(:name => 'Changed', :is_default => false)
- assert_nil Enumeration.default('IPRI')
+ assert_nil Enumeration.priorities.default
end
def test_change_default
e = Enumeration.find_by_name('Urgent')
e.update_attributes(:name => 'Urgent', :is_default => true)
- assert_equal e, Enumeration.default('IPRI')
+ assert_equal e, Enumeration.priorities.default
end
def test_destroy_with_reassign
:time_entries
def test_create
- issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'test_create', :description => 'IssueTest#test_create', :estimated_hours => '1:30')
+ issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.priorities.first, :subject => 'test_create', :description => 'IssueTest#test_create', :estimated_hours => '1:30')
assert issue.save
issue.reload
assert_equal 1.5, issue.estimated_hours
end
def test_create_minimal
- issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'test_create')
+ issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.priorities.first, :subject => 'test_create')
assert issue.save
assert issue.description.nil?
end
end
def test_category_based_assignment
- issue = Issue.create(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'Assignment test', :description => 'Assignment test', :category_id => 1)
+ issue = Issue.create(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.priorities.first, :subject => 'Assignment test', :description => 'Assignment test', :category_id => 1)
assert_equal IssueCategory.find(1).assigned_to, issue.assigned_to
end
def test_should_close_duplicates
# Create 3 issues
- issue1 = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 1, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'Duplicates test', :description => 'Duplicates test')
+ issue1 = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 1, :status_id => 1, :priority => Enumeration.priorities.first, :subject => 'Duplicates test', :description => 'Duplicates test')
assert issue1.save
issue2 = issue1.clone
assert issue2.save
def test_should_not_close_duplicated_issue
# Create 3 issues
- issue1 = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 1, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'Duplicates test', :description => 'Duplicates test')
+ issue1 = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 1, :status_id => 1, :priority => Enumeration.priorities.first, :subject => 'Duplicates test', :description => 'Duplicates test')
assert issue1.save
issue2 = issue1.clone
assert issue2.save
OSDN Git Service
