jro_apps/redmine Commit - r2411:4601ed2f3aeb

Replaces Enumeration.get_values and Enumeration.default with named scopes....

Jean-Philippe Lang -

r2411:4601ed2f3aeb

parent child

Context file:

r2411:4601ed2f3aeb

Collapse all files

app/controllers/documents_controller.rb +1 -1

               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

app/controllers/enumerations_controller.rb +1 -1

                     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'

app/controllers/issues_controller.rb +4 -4

                 @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']

app/controllers/reports_controller.rb +2 -2

                   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 }

app/helpers/timelog_helper.rb +1 -1

               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] }

app/models/document.rb +1 -1

               def after_initialize
                 if new_record?
-                  self.category ||= Enumeration.default('DCAT')
+                  self.category ||= Enumeration.document_categories.default
                 end
               end
             end

app/models/enumeration.rb +19 -7

@@ -26,17 +26,29 class Enumeration < ActiveRecord::Base
26		26
27	# Single table inheritance would be an option	27	# Single table inheritance would be an option
28	OPTIONS = {	28	OPTIONS = {
29	"IPRI" => {:label => :enumeration_issue_priorities, :model => Issue, :foreign_key => :priority_id},	29	"IPRI" => {:label => :enumeration_issue_priorities, :model => Issue, :foreign_key => :priority_id, :scope => :priorities},
30	"DCAT" => {:label => :enumeration_doc_categories, :model => Document, :foreign_key => :category_id},	30	"DCAT" => {:label => :enumeration_doc_categories, :model => Document, :foreign_key => :category_id, :scope => :document_categories},
31	"ACTI" => {:label => :enumeration_activities, :model => TimeEntry, :foreign_key => :activity_id}	31	"ACTI" => {:label => :enumeration_activities, :model => TimeEntry, :foreign_key => :activity_id, :scope => :activities}
32	}.freeze	32	}.freeze
33		33
34	def self.get_values(option)	34	# Creates a named scope for each type of value. The scope has a +default+ method
35	find(:all, :conditions => {:opt => option}, :order => 'position')	35	# that returns the default value, or nil if no value is set as default.
		36	# Example:
		37	# Enumeration.priorities
		38	# Enumeration.priorities.default
		39	OPTIONS.each do \|k, v\|
		40	next unless v[:scope]
		41	named_scope v[:scope], :conditions => { :opt => k }, :order => 'position' do
		42	def default
		43	find(:first, :conditions => { :is_default => true })
		44	end
		45	end
36	end	46	end
37		47
38	def self.default(option)	48	named_scope :values, lambda {\|opt\| { :conditions => { :opt => opt }, :order => 'position' } } do
39	find(:first, :conditions => {:opt => option, :is_default => true}, :order => 'position')	49	def default
		50	find(:first, :conditions => { :is_default => true })
		51	end
40	end	52	end
41		53
42	def option_name	54	def option_name

app/models/issue.rb +1 -1

                 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

app/models/time_entry.rb +1 -1

               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

app/views/documents/_form.rhtml +1 -1

             <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>

app/views/enumerations/list.rhtml +1 -1

             <% 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| %>

app/views/issues/bulk_edit.rhtml +1 -1

             <%= 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') +

lib/tasks/migrate_from_mantis.rake +1 -1

 => closed_status    # closed
                                     }
-                  priorities = Enumeration.get_values('IPRI')
+                  priorities = Enumeration.priorities
                   DEFAULT_PRIORITY = priorities[2]
                   PRIORITY_MAPPING = {10 => priorities[1], # none
 => priorities[1], # low

lib/tasks/migrate_from_trac.rake +1 -1

                                       'closed' => closed_status
                                       }
-                    priorities = Enumeration.get_values('IPRI')
+                    priorities = Enumeration.priorities
                     DEFAULT_PRIORITY = priorities[0]
                     PRIORITY_MAPPING = {'lowest' => priorities[0],
                                         'low' => priorities[0],

test/functional/issues_controller_test.rb +2 -2

                        :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'

test/unit/enumeration_test.rb +8 -8

               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

test/unit/issue_test.rb +5 -5

                        :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

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages