jro_apps/redmine Commit - r15293:57afa5345eea

app/controllers/application_controller.rb +2 -2

               def logout_user
                 if User.current.logged?
                   cookies.delete(autologin_cookie_name)
-                  Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin'])
+                  Token.where(["user_id = ? AND action = ?", User.current.id, 'autologin']).delete_all
-                  Token.delete_all(["user_id = ? AND action = ? AND value = ?", User.current.id, 'session', session[:tk]])
+                  Token.where(["user_id = ? AND action = ? AND value = ?", User.current.id, 'session', session[:tk]]).delete_all
                   self.logged_user = nil
                 end
               end

app/models/issue_status.rb +1 -1

               # Deletes associated workflows
               def delete_workflow_rules
-                WorkflowRule.delete_all(["old_status_id = :id OR new_status_id = :id", {:id => id}])
+                WorkflowRule.where(["old_status_id = :id OR new_status_id = :id", {:id => id}]).delete_all
               end
             end

app/models/project.rb +1 -1

               def delete_all_members
                 me, mr = Member.table_name, MemberRole.table_name
                 self.class.connection.delete("DELETE FROM #{mr} WHERE #{mr}.member_id IN (SELECT #{me}.id FROM #{me} WHERE #{me}.project_id = #{id})")
-                Member.delete_all(['project_id = ?', id])
+                Member.where(:project_id => id).delete_all
               end
               # Return a Principal scope of users/groups issues can be assigned to

db/migrate/098_set_topic_authors_as_watchers.rb +1 -1

               def self.down
                 # Removes all message watchers
-                Watcher.delete_all("watchable_type = 'Message'")
+                Watcher.where("watchable_type = 'Message'").delete_all
               end
             end

db/migrate/20100819172912_enable_calendar_and_gantt_modules_where_appropriate.rb +1 -1

               end
               def self.down
-                EnabledModule.delete_all("name = 'calendar' OR name = 'gantt'")
+                EnabledModule.where("name = 'calendar' OR name = 'gantt'").delete_all
               end
             end

db/migrate/20101104182107_add_unique_index_on_members.rb +2 -2

             class AddUniqueIndexOnMembers < ActiveRecord::Migration
               def self.up
                 # Clean and reassign MemberRole rows if needed
-                MemberRole.delete_all("member_id NOT IN (SELECT id FROM #{Member.table_name})")
+                MemberRole.where("member_id NOT IN (SELECT id FROM #{Member.table_name})").delete_all
                 MemberRole.update_all("member_id =" +
                   " (SELECT min(m2.id) FROM #{Member.table_name} m1, #{Member.table_name} m2" +
                   " WHERE m1.user_id = m2.user_id AND m1.project_id = m2.project_id" +
                 # Remove duplicates
                 Member.connection.select_values("SELECT m.id FROM #{Member.table_name} m" +
                   " WHERE m.id > (SELECT min(m1.id) FROM #{Member.table_name} m1 WHERE m1.user_id = m.user_id AND m1.project_id = m.project_id)").each do |i|
-                    Member.delete_all(["id = ?", i])
+                    Member.where(["id = ?", i]).delete_all
                   end
                 # Then add a unique index

db/migrate/20111201201315_add_unique_index_to_issue_relations.rb +1 -1

                 # Remove duplicates
                 IssueRelation.connection.select_values("SELECT r.id FROM #{IssueRelation.table_name} r" +
                   " WHERE r.id > (SELECT min(r1.id) FROM #{IssueRelation.table_name} r1 WHERE r1.issue_from_id = r.issue_from_id AND r1.issue_to_id = r.issue_to_id)").each do |i|
-                    IssueRelation.delete_all(["id = ?", i])
+                    IssueRelation.where(["id = ?", i]).delete_all
                 end
                 add_index :issue_relations, [:issue_from_id, :issue_to_id], :unique => true

lib/tasks/migrate_from_mantis.rake +1 -1

                   # Users
                   print "Migrating users"
-                  User.delete_all "login <> 'admin'"
+                  User.where("login <> 'admin'").delete_all
                   users_map = {}
                   users_migrated = 0
                   MantisUser.all.each do |user|

test/functional/admin_controller_test.rb +1 -1

               private
               def delete_configuration_data
-                Role.delete_all('builtin = 0')
+                Role.where('builtin = 0').delete_all
                 Tracker.delete_all
                 IssueStatus.delete_all
                 Enumeration.delete_all

test/functional/issues_controller_test.rb +6 -6

               end
               def test_index_should_not_list_issues_when_module_disabled
-                EnabledModule.delete_all("name = 'issue_tracking' AND project_id = 1")
+                EnabledModule.where("name = 'issue_tracking' AND project_id = 1").delete_all
                 get :index
                 assert_response :success
                 assert_template 'index'
               def test_show_should_display_update_form_with_minimal_permissions
                 Role.find(1).update_attribute :permissions, [:view_issues, :add_issue_notes]
-                WorkflowTransition.delete_all :role_id => 1
+                WorkflowTransition.where(:role_id => 1).delete_all
                 @request.session[:user_id] = 2
                 get :show, :id => 1
               def test_get_new_with_minimal_permissions
                 Role.find(1).update_attribute :permissions, [:add_issues]
-                WorkflowTransition.delete_all :role_id => 1
+                WorkflowTransition.where(:role_id => 1).delete_all
                 @request.session[:user_id] = 2
                 get :new, :project_id => 1, :tracker_id => 1
               end
               def setup_without_workflow_privilege
-                WorkflowTransition.delete_all(["role_id = ?", Role.anonymous.id])
+                WorkflowTransition.where(["role_id = ?", Role.anonymous.id]).delete_all
                 Role.anonymous.add_permission! :add_issues, :add_issue_notes
               end
               private :setup_without_workflow_privilege
               end
               def setup_with_workflow_privilege
-                WorkflowTransition.delete_all(["role_id = ?", Role.anonymous.id])
+                WorkflowTransition.where(["role_id = ?", Role.anonymous.id]).delete_all
                 WorkflowTransition.create!(:role => Role.anonymous, :tracker_id => 1,
                                            :old_status_id => 1, :new_status_id => 3)
                 WorkflowTransition.create!(:role => Role.anonymous, :tracker_id => 1,
                 # Fixes random test failure with Mysql
                 # where Issue.where(:project_id => 2).limit(2).order('id desc')
                 # doesn't return the expected results
-                Issue.delete_all("project_id=2")
+                Issue.where("project_id=2").delete_all
                 @request.session[:user_id] = 2
                 assert_difference 'Issue.count', 2 do

test/unit/default_data_test.rb +2 -2

               def test_no_data
                 assert !Redmine::DefaultData::Loader::no_data?
-                Role.delete_all("builtin = 0")
+                Role.where("builtin = 0").delete_all
                 Tracker.delete_all
                 IssueStatus.delete_all
                 Enumeration.delete_all
               def test_load
                 valid_languages.each do |lang|
                   begin
-                    Role.delete_all("builtin = 0")
+                    Role.where("builtin = 0").delete_all
                     Tracker.delete_all
                     IssueStatus.delete_all
                     Enumeration.delete_all

test/unit/news_test.rb +1 -1

               end
               def test_should_not_include_news_for_projects_with_news_disabled
-                EnabledModule.delete_all(["project_id = ? AND name = ?", 2, 'news'])
+                EnabledModule.where(["project_id = ? AND name = ?", 2, 'news']).delete_all
                 project = Project.find(2)
                 # Add a piece of news to the project

test/unit/user_test.rb +1 -1

               end
               def test_own_account_deletable_should_be_false_for_a_single_admin
-                User.delete_all(["admin = ? AND id <> ?", true, 1])
+                User.where(["admin = ? AND id <> ?", true, 1]).delete_all
                 with_settings :unsubscribe => '1' do
                   assert_equal false, User.find(1).own_account_deletable?

test/unit/watcher_test.rb +1 -1

               end
               def test_prune_with_user
-                Watcher.delete_all("user_id = 9")
+                Watcher.where("user_id = 9").delete_all
                 user = User.find(9)
                 # public

	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