jro_apps/redmine Commit - r2969:d8c5549168f3

Changes misleading scopes on Enumeration....

Jean-Philippe Lang -

r2969:d8c5549168f3

parent child

Context file:

r2969:d8c5549168f3

Collapse all files

app/helpers/timelog_helper.rb +1 -1

               def activity_collection_for_select_options(time_entry=nil, project=nil)
                 project ||= @project
                 if project.nil?
-                  activities = TimeEntryActivity.active
+                  activities = TimeEntryActivity.shared.active
                 else
                   activities = project.activities
                 end

app/models/enumeration.rb +4 -8

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Enumeration < ActiveRecord::Base
+              default_scope :order => "#{Enumeration.table_name}.position ASC"
               belongs_to :project
               acts_as_list :scope => 'type = \'#{type}\''
               end
               # End backwards compatiblity named_scopes
-              named_scope :all, :order => 'position', :conditions => { :project_id => nil }
+              named_scope :shared, :conditions => { :project_id => nil }
+              named_scope :active, :conditions => { :active => true }
-              named_scope :active, lambda {
-                  :conditions => {:active => true, :project_id => nil},
-                  :order => 'position'
               def self.default
                 # Creates a fake default scope so Enumeration.default will check

app/models/project.rb +5 -9

               STATUS_ARCHIVED   = 9
               # Specific overidden Activities
-              has_many :time_entry_activities do
+              has_many :time_entry_activities
-                def active
-                  find(:all, :conditions => {:active => true})
-                end
-              end
               has_many :members, :include => [:user, :roles], :conditions => "#{User.table_name}.type='User' AND #{User.table_name}.status=#{User::STATUS_ACTIVE}"
               has_many :member_principals, :class_name => 'Member',
                                            :include => :principal,
                 overridden_activity_ids = self.time_entry_activities.active.collect(&:parent_id)
                 if overridden_activity_ids.empty?
-                  return TimeEntryActivity.active
+                  return TimeEntryActivity.shared.active
                 else
                   return system_activities_and_project_overrides
                 end
                 overridden_activity_ids = self.time_entry_activities.collect(&:parent_id)
                 if overridden_activity_ids.empty?
-                  return TimeEntryActivity.all
+                  return TimeEntryActivity.shared
                 else
                   return system_activities_and_project_overrides(true)
                 end
               # Returns the systemwide active activities merged with the project specific overrides
               def system_activities_and_project_overrides(include_inactive=false)
                 if include_inactive
-                  return TimeEntryActivity.all.
+                  return TimeEntryActivity.shared.
                     find(:all,
                          :conditions => ["id NOT IN (?)", self.time_entry_activities.collect(&:parent_id)]) +
                     self.time_entry_activities
                 else
-                  return TimeEntryActivity.active.
+                  return TimeEntryActivity.shared.active.
                     find(:all,
                          :conditions => ["id NOT IN (?)", self.time_entry_activities.active.collect(&:parent_id)]) +
                     self.time_entry_activities.active

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

             <% Enumeration.get_subclasses.each do |klass| %>
             <h3><%= l(klass::OptionName) %></h3>
-            <% enumerations = klass.all %>
+            <% enumerations = klass.shared %>
             <% if enumerations.any? %>
             <table class="list">
             <tr>

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