jro_apps/redmine Commit - r10660:9a270c46c0aa

Code cleanup....

Jean-Philippe Lang -

r10660:9a270c46c0aa

parent child

Context file:

r10660:9a270c46c0aa

Collapse all files

app/models/issue_category.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class IssueCategory < ActiveRecord::Base
               include Redmine::SafeAttributes
               belongs_to :project
               belongs_to :assigned_to, :class_name => 'Principal', :foreign_key => 'assigned_to_id'
               has_many :issues, :foreign_key => 'category_id', :dependent => :nullify
               validates_presence_of :name
               validates_uniqueness_of :name, :scope => [:project_id]
               validates_length_of :name, :maximum => 30
               safe_attributes 'name', 'assigned_to_id'
-              scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
+              scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
               alias :destroy_without_reassign :destroy
               # Destroy the category
               # If a category is specified, issues are reassigned to this category
               def destroy(reassign_to = nil)
                 if reassign_to && reassign_to.is_a?(IssueCategory) && reassign_to.project == self.project
                   Issue.update_all("category_id = #{reassign_to.id}", "category_id = #{id}")
                 end
                 destroy_without_reassign
               end
               def <=>(category)
                 name <=> category.name
               end
               def to_s; name end
             end

app/models/issue_status.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class IssueStatus < ActiveRecord::Base
               before_destroy :check_integrity
               has_many :workflows, :class_name => 'WorkflowTransition', :foreign_key => "old_status_id"
               acts_as_list
               before_destroy :delete_workflow_rules
               after_save     :update_default
               validates_presence_of :name
               validates_uniqueness_of :name
               validates_length_of :name, :maximum => 30
               validates_inclusion_of :default_done_ratio, :in => 0..100, :allow_nil => true
               scope :sorted, order("#{table_name}.position ASC")
-              scope :named, lambda {|arg| where(["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip])}
+              scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
               def update_default
                 IssueStatus.update_all({:is_default => false}, ['id <> ?', id]) if self.is_default?
               end
               # Returns the default status for new issues
               def self.default
                 where(:is_default => true).first
               end
               # Update all the +Issues+ setting their done_ratio to the value of their +IssueStatus+
               def self.update_issue_done_ratios
                 if Issue.use_status_for_done_ratio?
                   IssueStatus.where("default_done_ratio >= 0").all.each do |status|
                     Issue.update_all({:done_ratio => status.default_done_ratio}, {:status_id => status.id})
                   end
                 end
                 return Issue.use_status_for_done_ratio?
               end
               # Returns an array of all statuses the given role can switch to
               # Uses association cache when called more than one time
               def new_statuses_allowed_to(roles, tracker, author=false, assignee=false)
                 if roles && tracker
                   role_ids = roles.collect(&:id)
                   transitions = workflows.select do |w|
                     role_ids.include?(w.role_id) &&
                     w.tracker_id == tracker.id &&
                     ((!w.author && !w.assignee) || (author && w.author) || (assignee && w.assignee))
                   end
                   transitions.map(&:new_status).compact.sort
                 else
                   []
                 end
               end
               # Same thing as above but uses a database query
               # More efficient than the previous method if called just once
               def find_new_statuses_allowed_to(roles, tracker, author=false, assignee=false)
                 if roles.present? && tracker
                   conditions = "(author = :false AND assignee = :false)"
                   conditions << " OR author = :true" if author
                   conditions << " OR assignee = :true" if assignee
                   workflows.
                     includes(:new_status).
                     where(["role_id IN (:role_ids) AND tracker_id = :tracker_id AND (#{conditions})",
                       {:role_ids => roles.collect(&:id), :tracker_id => tracker.id, :true => true, :false => false}
                       ]).all.
                     map(&:new_status).compact.sort
                 else
                   []
                 end
               end
               def <=>(status)
                 position <=> status.position
               end
               def to_s; name end
               private
               def check_integrity
                 raise "Can't delete status" if Issue.where(:status_id => id).any?
               end
               # Deletes associated workflows
               def delete_workflow_rules
                 WorkflowRule.delete_all(["old_status_id = :id OR new_status_id = :id", {:id => id}])
               end
             end

app/models/version.rb +6 -5

             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Version < ActiveRecord::Base
               include Redmine::SafeAttributes
               after_update :update_issues_from_sharing_change
               belongs_to :project
               has_many :fixed_issues, :class_name => 'Issue', :foreign_key => 'fixed_version_id', :dependent => :nullify
               acts_as_customizable
               acts_as_attachable :view_permission => :view_files,
                                  :delete_permission => :manage_files
               VERSION_STATUSES = %w(open locked closed)
               VERSION_SHARINGS = %w(none descendants hierarchy tree system)
               validates_presence_of :name
               validates_uniqueness_of :name, :scope => [:project_id]
               validates_length_of :name, :maximum => 60
               validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :not_a_date, :allow_nil => true
               validates_inclusion_of :status, :in => VERSION_STATUSES
               validates_inclusion_of :sharing, :in => VERSION_SHARINGS
               validate :validate_version
-              scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
+              scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
-              scope :open, :conditions => {:status => 'open'}
+              scope :open, where(:status => 'open')
-              scope :visible, lambda {|*args| { :include => :project,
+              scope :visible, lambda {|*args|
-                                                      :conditions => Project.allowed_to_condition(args.first || User.current, :view_issues) } }
+                includes(:project).where(Project.allowed_to_condition(args.first || User.current, :view_issues))
+              }
               safe_attributes 'name',
                 'description',
                 'effective_date',
                 'due_date',
                 'wiki_page_title',
                 'status',
                 'sharing',
                 'custom_field_values'
               # Returns true if +user+ or current user is allowed to view the version
               def visible?(user=User.current)
                 user.allowed_to?(:view_issues, self.project)
               end
               # Version files have same visibility as project files
               def attachments_visible?(*args)
                 project.present? && project.attachments_visible?(*args)
               end
               def start_date
                 @start_date ||= fixed_issues.minimum('start_date')
               end
               def due_date
                 effective_date
               end
               def due_date=(arg)
                 self.effective_date=(arg)
               end
               # Returns the total estimated time for this version
               # (sum of leaves estimated_hours)
               def estimated_hours
                 @estimated_hours ||= fixed_issues.leaves.sum(:estimated_hours).to_f
               end
               # Returns the total reported time for this version
               def spent_hours
-                @spent_hours ||= TimeEntry.sum(:hours, :joins => :issue, :conditions => ["#{Issue.table_name}.fixed_version_id = ?", id]).to_f
+                @spent_hours ||= TimeEntry.joins(:issue).where("#{Issue.table_name}.fixed_version_id = ?", id).sum(:hours).to_f
               end
               def closed?
                 status == 'closed'
               end
               def open?
                 status == 'open'
               end
               # Returns true if the version is completed: due date reached and no open issues
               def completed?
                 effective_date && (effective_date < Date.today) && (open_issues_count == 0)
               end
               def behind_schedule?
                 if completed_pourcent == 100
                   return false
                 elsif due_date && start_date
                   done_date = start_date + ((due_date - start_date+1)* completed_pourcent/100).floor
                   return done_date <= Date.today
                 else
                   false # No issues so it's not late
                 end
               end
               # Returns the completion percentage of this version based on the amount of open/closed issues
               # and the time spent on the open issues.
               def completed_pourcent
                 if issues_count == 0
                 elsif open_issues_count == 0
                 else
                   issues_progress(false) + issues_progress(true)
                 end
               end
               # Returns the percentage of issues that have been marked as 'closed'.
               def closed_pourcent
                 if issues_count == 0
                 else
                   issues_progress(false)
                 end
               end
               # Returns true if the version is overdue: due date reached and some open issues
               def overdue?
                 effective_date && (effective_date < Date.today) && (open_issues_count > 0)
               end
               # Returns assigned issues count
               def issues_count
                 load_issue_counts
                 @issue_count
               end
               # Returns the total amount of open issues for this version.
               def open_issues_count
                 load_issue_counts
                 @open_issues_count
               end
               # Returns the total amount of closed issues for this version.
               def closed_issues_count
                 load_issue_counts
                 @closed_issues_count
               end
               def wiki_page
                 if project.wiki && !wiki_page_title.blank?
                   @wiki_page ||= project.wiki.find_page(wiki_page_title)
                 end
                 @wiki_page
               end
               def to_s; name end
               def to_s_with_project
                 "#{project} - #{name}"
               end
               # Versions are sorted by effective_date and name
               # Those with no effective_date are at the end, sorted by name
               def <=>(version)
                 if self.effective_date
                   if version.effective_date
                     if self.effective_date == version.effective_date
                       name == version.name ? id <=> version.id : name <=> version.name
                     else
                       self.effective_date <=> version.effective_date
                     end
                   else
                     -1
                   end
                 else
                   if version.effective_date
                   else
                     name == version.name ? id <=> version.id : name <=> version.name
                   end
                 end
               end
               def self.fields_for_order_statement(table=nil)
                 table ||= table_name
                 ["(CASE WHEN #{table}.effective_date IS NULL THEN 1 ELSE 0 END)", "#{table}.effective_date", "#{table}.name", "#{table}.id"]
               end
               scope :sorted, order(fields_for_order_statement)
               # Returns the sharings that +user+ can set the version to
               def allowed_sharings(user = User.current)
                 VERSION_SHARINGS.select do |s|
                   if sharing == s
                     true
                   else
                     case s
                     when 'system'
                       # Only admin users can set a systemwide sharing
                       user.admin?
                     when 'hierarchy', 'tree'
                       # Only users allowed to manage versions of the root project can
                       # set sharing to hierarchy or tree
                       project.nil? || user.allowed_to?(:manage_versions, project.root)
                     else
                       true
                     end
                   end
                 end
               end
               private
               def load_issue_counts
                 unless @issue_count
                   @open_issues_count = 0
                   @closed_issues_count = 0
                   fixed_issues.count(:all, :group => :status).each do |status, count|
                     if status.is_closed?
                       @closed_issues_count += count
                     else
                       @open_issues_count += count
                     end
                   end
                   @issue_count = @open_issues_count + @closed_issues_count
                 end
               end
               # Update the issue's fixed versions. Used if a version's sharing changes.
               def update_issues_from_sharing_change
                 if sharing_changed?
                   if VERSION_SHARINGS.index(sharing_was).nil? ||
                       VERSION_SHARINGS.index(sharing).nil? ||
                       VERSION_SHARINGS.index(sharing_was) > VERSION_SHARINGS.index(sharing)
                     Issue.update_versions_from_sharing_change self
                   end
                 end
               end
               # Returns the average estimated time of assigned issues
               # or 1 if no issue has an estimated time
               # Used to weigth unestimated issues in progress calculation
               def estimated_average
                 if @estimated_average.nil?
                   average = fixed_issues.average(:estimated_hours).to_f
                   if average == 0
                     average = 1
                   end
                   @estimated_average = average
                 end
                 @estimated_average
               end
               # Returns the total progress of open or closed issues.  The returned percentage takes into account
               # the amount of estimated time set for this version.
               #
               # Examples:
               # issues_progress(true)   => returns the progress percentage for open issues.
               # issues_progress(false)  => returns the progress percentage for closed issues.
               def issues_progress(open)
                 @issues_progress ||= {}
                 @issues_progress[open] ||= begin
                   progress = 0
                   if issues_count > 0
                     ratio = open ? 'done_ratio' : 100
                     done = fixed_issues.sum("COALESCE(estimated_hours, #{estimated_average}) * #{ratio}",
                                               :joins => :status,
                                               :conditions => ["#{IssueStatus.table_name}.is_closed = ?", !open]).to_f
                     progress = done / (estimated_average * issues_count)
                   end
                   progress
                 end
               end
               def validate_version
                 if effective_date.nil? && @attributes['effective_date'].present?
                   errors.add :effective_date, :not_a_date
                 end
               end
             end

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