jro_apps/redmine Commit - r120:b4d4b80dcd53

replaced deprecated ":dependent => true" statements...

Jean-Philippe Lang -

r120:b4d4b80dcd53

parent child

Context file:

r120:b4d4b80dcd53

Collapse all files

app/models/comment.rb +17 0

@@ -1,6 +1,23
		1	# redMine - project management software
		2	# Copyright (C) 2006 Jean-Philippe Lang
		3	#
		4	# This program is free software; you can redistribute it and/or
		5	# modify it under the terms of the GNU General Public License
		6	# as published by the Free Software Foundation; either version 2
		7	# of the License, or (at your option) any later version.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU General Public License
		15	# along with this program; if not, write to the Free Software
		16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		17
1	class Comment < ActiveRecord::Base	18	class Comment < ActiveRecord::Base
2	belongs_to :commented, :polymorphic => true, :counter_cache => true	19	belongs_to :commented, :polymorphic => true, :counter_cache => true
3	belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'	20	belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
4		21
5	validates_presence_of :commented, :author, :comment	22	validates_presence_of :commented, :author, :comment
6	end	23	end

app/models/custom_field.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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 CustomField < ActiveRecord::Base
-              has_many :custom_values, :dependent => true
+              has_many :custom_values, :dependent => :delete_all
               FIELD_FORMATS = { "string" => { :name => :label_string, :order => 1 },
                                 "text" => { :name => :label_text, :order => 2 },
                                 "int" => { :name => :label_integer, :order => 3 },
                                 "list" => { :name => :label_list, :order => 4 },
             			        "date" => { :name => :label_date, :order => 5 },
             			        "bool" => { :name => :label_boolean, :order => 6 }
               }.freeze
               validates_presence_of :name, :field_format
               validates_uniqueness_of :name
               validates_format_of :name, :with => /^[\w\s\'\-]*$/i
               validates_inclusion_of :field_format, :in => FIELD_FORMATS.keys
               validates_presence_of :possible_values, :if => Proc.new { |field| field.field_format == "list" }
               # to move in project_custom_field
               def self.for_all
                 find(:all, :conditions => ["is_for_all=?", true])
               end
               def type_name
                 nil
               end
             end

app/models/document.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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 Document < ActiveRecord::Base
               belongs_to :project
               belongs_to :category, :class_name => "Enumeration", :foreign_key => "category_id"
-              has_many :attachments, :as => :container, :dependent => true
+              has_many :attachments, :as => :container, :dependent => :destroy
               validates_presence_of :project, :title, :category
             end

app/models/issue.rb +3 -4

             # redMine - project management software
             # Copyright (C) 2006  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 Issue < ActiveRecord::Base
               belongs_to :project
               belongs_to :tracker
               belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
               belongs_to :assigned_to, :class_name => 'User', :foreign_key => 'assigned_to_id'
               belongs_to :fixed_version, :class_name => 'Version', :foreign_key => 'fixed_version_id'
               belongs_to :priority, :class_name => 'Enumeration', :foreign_key => 'priority_id'
               belongs_to :category, :class_name => 'IssueCategory', :foreign_key => 'category_id'
-              #has_many :histories, :class_name => 'IssueHistory', :dependent => true, :order => "issue_histories.created_on DESC", :include => :status
+              has_many :journals, :as => :journalized, :dependent => :destroy
-              has_many :journals, :as => :journalized, :dependent => true
+              has_many :attachments, :as => :container, :dependent => :destroy
-              has_many :attachments, :as => :container, :dependent => true
-              has_many :custom_values, :dependent => true, :as => :customized
+              has_many :custom_values, :dependent => :delete_all, :as => :customized
               has_many :custom_fields, :through => :custom_values
               validates_presence_of :subject, :description, :priority, :tracker, :author, :status
               validates_inclusion_of :done_ratio, :in => 0..100
               validates_associated :custom_values, :on => :update
               # set default status for new issues
               def before_validation
                 self.status = IssueStatus.default if new_record?
               end
               def validate
                 if self.due_date.nil? && @attributes['due_date'] && !@attributes['due_date'].empty?
                   errors.add :due_date, :activerecord_error_not_a_date
                 end
                 if self.due_date and self.start_date and self.due_date < self.start_date
                   errors.add :due_date, :activerecord_error_greater_than_start_date
                 end
               end
               #def before_create
               #  build_history
               #end
               def before_save
                 if @current_journal
                   # attributes changes
                   (Issue.column_names - %w(id description)).each {|c|
                     @current_journal.details << JournalDetail.new(:property => 'attr',
                                                                   :prop_key => c,
                                                                   :old_value => @issue_before_change.send(c),
                                                                   :value => send(c)) unless send(c)==@issue_before_change.send(c)
                   }
                   # custom fields changes
                   custom_values.each {|c|
                     @current_journal.details << JournalDetail.new(:property => 'cf',
                                                                   :prop_key => c.custom_field_id,
                                                                   :old_value => @custom_values_before_change[c.custom_field_id],
                                                                   :value => c.value) unless @custom_values_before_change[c.custom_field_id]==c.value
                   }
                   @current_journal.save unless @current_journal.details.empty? and @current_journal.notes.empty?
                 end
               end
               def long_id
                 "%05d" % self.id
               end
               def custom_value_for(custom_field)
                 self.custom_values.each {|v| return v if v.custom_field_id == custom_field.id }
                 return nil
               end
               def init_journal(user, notes = "")
                 @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
                 @issue_before_change = self.clone
                 @custom_values_before_change = {}
                 self.custom_values.each {|c| @custom_values_before_change.store c.custom_field_id, c.value }
                 @current_journal
               end
             private
               # Creates an history for the issue
               #def build_history
               #  @history = self.histories.build
               #  @history.status = self.status
               #  @history.author = self.author
               #end
             end

app/models/journal.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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 Journal < ActiveRecord::Base
               belongs_to :journalized, :polymorphic => true
               belongs_to :user
-              has_many :details, :class_name => "JournalDetail", :dependent => true
+              has_many :details, :class_name => "JournalDetail", :dependent => :delete_all
             end

app/models/news.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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 News < ActiveRecord::Base
               belongs_to :project
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
-              has_many :comments, :as => :commented, :dependent => true, :order => "created_on"
+              has_many :comments, :as => :commented, :dependent => :delete_all, :order => "created_on"
               validates_presence_of :title, :description
               # returns last created news
               def self.latest
                 find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC")
               end
             end

app/models/project.rb +9 -9

             # redMine - project management software
             # Copyright (C) 2006  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 Project < ActiveRecord::Base
-              has_many :versions, :dependent => true, :order => "versions.effective_date DESC, versions.name DESC"
+              has_many :versions, :dependent => :destroy, :order => "versions.effective_date DESC, versions.name DESC"
-              has_many :members, :dependent => true, :include => :user, :conditions => "users.status=#{User::STATUS_ACTIVE}"
+              has_many :members, :dependent => :delete_all, :include => :user, :conditions => "users.status=#{User::STATUS_ACTIVE}"
               has_many :users, :through => :members
-              has_many :custom_values, :dependent => true, :as => :customized
+              has_many :custom_values, :dependent => :delete_all, :as => :customized
-              has_many :issues, :dependent => true, :order => "issues.created_on DESC", :include => [:status, :tracker]
+              has_many :issues, :dependent => :destroy, :order => "issues.created_on DESC", :include => [:status, :tracker]
-              has_many :queries, :dependent => true
+              has_many :queries, :dependent => :delete_all
-              has_many :documents, :dependent => true
+              has_many :documents, :dependent => :destroy
-              has_many :news, :dependent => true, :include => :author
+              has_many :news, :dependent => :delete_all, :include => :author
-              has_many :issue_categories, :dependent => true, :order => "issue_categories.name"
+              has_many :issue_categories, :dependent => :delete_all, :order => "issue_categories.name"
-              has_one :repository, :dependent => true
+              has_one :repository, :dependent => :destroy
               has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => 'custom_fields_projects', :association_foreign_key => 'custom_field_id'
               acts_as_tree :order => "name", :counter_cache => true
               validates_presence_of :name, :description
               validates_uniqueness_of :name
               validates_associated :custom_values, :on => :update
               validates_associated :repository
               validates_format_of :name, :with => /^[\w\s\'\-]*$/i
               # returns 5 last created projects
               def self.latest
                 find(:all, :limit => 5, :order => "created_on DESC")
               end
               # Returns an array of all custom fields enabled for project issues
               # (explictly associated custom fields and custom fields enabled for all projects)
               def custom_fields_for_issues(tracker)
                 tracker.custom_fields.find(:all, :include => :projects,
                                            :conditions => ["is_for_all=? or project_id=?", true, self.id])
                 #(CustomField.for_all + custom_fields).uniq
               end
               def all_custom_fields
                 @all_custom_fields ||= IssueCustomField.find(:all, :include => :projects,
                                            :conditions => ["is_for_all=? or project_id=?", true, self.id])
               end
             protected
               def validate
                 errors.add(parent_id, " must be a root project") if parent and parent.parent
                 errors.add_to_base("A project with subprojects can't be a subproject") if parent and projects_count > 0
               end
             end

app/models/role.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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 Role < ActiveRecord::Base
               before_destroy :check_integrity
               has_and_belongs_to_many :permissions
-              has_many :workflows, :dependent => true
+              has_many :workflows, :dependent => :delete_all
               has_many :members
               validates_presence_of :name
               validates_uniqueness_of :name
               validates_format_of :name, :with => /^[\w\s\'\-]*$/i
             private
               def check_integrity
                 raise "Can't delete role" if Member.find(:first, :conditions =>["role_id=?", self.id])
               end
             end

app/models/tracker.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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 Tracker < ActiveRecord::Base
               before_destroy :check_integrity
               has_many :issues
-              has_many :workflows, :dependent => true
+              has_many :workflows, :dependent => :delete_all
               has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => 'custom_fields_trackers', :association_foreign_key => 'custom_field_id'
               validates_presence_of :name
               validates_uniqueness_of :name
               validates_format_of :name, :with => /^[\w\s\'\-]*$/i
             private
               def check_integrity
                 raise "Can't delete tracker" if Issue.find(:first, :conditions => ["tracker_id=?", self.id])
               end
             end

app/models/user.rb +3 -3

             # redMine - project management software
             # Copyright (C) 2006  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.
             require "digest/sha1"
             class User < ActiveRecord::Base
-              has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :dependent => true
+              has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :dependent => :delete_all
               has_many :projects, :through => :memberships
-              has_many :custom_values, :dependent => true, :as => :customized
+              has_many :custom_values, :dependent => :delete_all, :as => :customized
-              has_one :preference, :dependent => true, :class_name => 'UserPreference'
+              has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
               belongs_to :auth_source
               attr_accessor :password, :password_confirmation
               attr_accessor :last_before_login_on
               # Prevents unauthorized assignments
               attr_protected :login, :admin, :password, :password_confirmation, :hashed_password
               validates_presence_of :login, :firstname, :lastname, :mail
               validates_uniqueness_of :login, :mail
               # Login must contain lettres, numbers, underscores only
               validates_format_of :firstname, :lastname, :with => /^[\w\s\'\-]*$/i
               validates_format_of :login, :with => /^[a-z0-9_\-@\.]+$/i
               validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
               # Password length between 4 and 12
               validates_length_of :password, :in => 4..12, :allow_nil => true
               validates_confirmation_of :password, :allow_nil => true
               validates_associated :custom_values, :on => :update
               # Account statuses
               STATUS_ACTIVE     = 1
               STATUS_REGISTERED = 2
               STATUS_LOCKED     = 3
               def before_save
                 # update hashed_password if password was set
                 self.hashed_password = User.hash_password(self.password) if self.password
               end
               # Returns the user that matches provided login and password, or nil
               def self.try_to_login(login, password)
                 user = find(:first, :conditions => ["login=?", login])
                 if user
                   # user is already in local database
                   return nil if !user.active?
                   if user.auth_source
                     # user has an external authentication method
                     return nil unless user.auth_source.authenticate(login, password)
                   else
                     # authentication with local password
                     return nil unless User.hash_password(password) == user.hashed_password
                   end
                 else
                   # user is not yet registered, try to authenticate with available sources
                   attrs = AuthSource.authenticate(login, password)
                   if attrs
                     onthefly = new(*attrs)
                     onthefly.login = login
                     onthefly.language = $RDM_DEFAULT_LANG
                     if onthefly.save
                       user = find(:first, :conditions => ["login=?", login])
                       logger.info("User '#{user.login}' created on the fly.") if logger
                     end
                   end
                 end
                 user.update_attribute(:last_login_on, Time.now) if user
                 user
                 rescue => text
                   raise text
               end
               # Return user's full name for display
               def display_name
                 firstname + " " + lastname
               end
               def name
                 display_name
               end
               def active?
                 self.status == STATUS_ACTIVE
               end
               def registered?
                 self.status == STATUS_REGISTERED
               end
               def locked?
                 self.status == STATUS_LOCKED
               end
               def check_password?(clear_password)
                 User.hash_password(clear_password) == self.hashed_password
               end
               def role_for_project(project_id)
                 @role_for_projects ||=
                   begin
                     roles = {}
                     self.memberships.each { |m| roles.store m.project_id, m.role_id }
                     roles
                   end
                 @role_for_projects[project_id]
               end
               def pref
                 self.preference ||= UserPreference.new(:user => self)
               end
             private
               # Return password digest
               def self.hash_password(clear_password)
                 Digest::SHA1.hexdigest(clear_password || "")
               end
             end

app/models/version.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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
               before_destroy :check_integrity
               belongs_to :project
               has_many :fixed_issues, :class_name => 'Issue', :foreign_key => 'fixed_version_id'
-              has_many :attachments, :as => :container, :dependent => true
+              has_many :attachments, :as => :container, :dependent => :destroy
               validates_presence_of :name
               validates_uniqueness_of :name, :scope => [:project_id]
               validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :activerecord_error_not_a_date
             private
               def check_integrity
                 raise "Can't delete version" if self.fixed_issues.find(:first)
               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