diff options
| -rw-r--r-- | app/models/issue_query.rb | 4 | ||||
| -rw-r--r-- | app/models/user.rb | 2 | ||||
| -rw-r--r-- | db/migrate/20131004113137_support_for_multiple_commit_keywords.rb | 6 | ||||
| -rw-r--r-- | db/migrate/20141029181752_add_trackers_default_status_id.rb | 4 | ||||
| -rw-r--r-- | db/migrate/20141029181824_remove_issue_statuses_is_default.rb | 2 | ||||
| -rw-r--r-- | lib/redmine/nested_set/issue_nested_set.rb | 2 | ||||
| -rw-r--r-- | lib/redmine/nested_set/project_nested_set.rb | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb index 5ff0e5530..a2e821f9f 100644 --- a/app/models/issue_query.rb +++ b/app/models/issue_query.rb @@ -599,7 +599,7 @@ class IssueQuery < Query "1=0" end when "~" - root_id, lft, rgt = Issue.where(:id => value.first.to_i).pluck(:root_id, :lft, :rgt).first + root_id, lft, rgt = Issue.where(:id => value.first.to_i).pick(:root_id, :lft, :rgt) if root_id && lft && rgt "#{Issue.table_name}.root_id = #{root_id} AND #{Issue.table_name}.lft > #{lft} AND #{Issue.table_name}.rgt < #{rgt}" else @@ -624,7 +624,7 @@ class IssueQuery < Query "1=0" end when "~" - root_id, lft, rgt = Issue.where(:id => value.first.to_i).pluck(:root_id, :lft, :rgt).first + root_id, lft, rgt = Issue.where(:id => value.first.to_i).pick(:root_id, :lft, :rgt) if root_id && lft && rgt "#{Issue.table_name}.root_id = #{root_id} AND #{Issue.table_name}.lft < #{lft} AND #{Issue.table_name}.rgt > #{rgt}" else diff --git a/app/models/user.rb b/app/models/user.rb index b25bab926..a3d2449d2 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -665,7 +665,7 @@ class User < Principal return @project_ids_by_role if @project_ids_by_role group_class = anonymous? ? GroupAnonymous.unscoped : GroupNonMember.unscoped - group_id = group_class.pluck(:id).first + group_id = group_class.pick(:id) members = Member.joins(:project, :member_roles). where("#{Project.table_name}.status <> 9"). diff --git a/db/migrate/20131004113137_support_for_multiple_commit_keywords.rb b/db/migrate/20131004113137_support_for_multiple_commit_keywords.rb index d8beb4aea..d7a9d5cc3 100644 --- a/db/migrate/20131004113137_support_for_multiple_commit_keywords.rb +++ b/db/migrate/20131004113137_support_for_multiple_commit_keywords.rb @@ -2,9 +2,9 @@ class SupportForMultipleCommitKeywords < ActiveRecord::Migration[4.2] def up # Replaces commit_fix_keywords, commit_fix_status_id, commit_fix_done_ratio settings # with commit_update_keywords setting - keywords = Setting.where(:name => 'commit_fix_keywords').limit(1).pluck(:value).first - status_id = Setting.where(:name => 'commit_fix_status_id').limit(1).pluck(:value).first - done_ratio = Setting.where(:name => 'commit_fix_done_ratio').limit(1).pluck(:value).first + keywords = Setting.where(:name => 'commit_fix_keywords').pick(:value) + status_id = Setting.where(:name => 'commit_fix_status_id').pick(:value) + done_ratio = Setting.where(:name => 'commit_fix_done_ratio').pick(:value) if keywords.present? Setting.commit_update_keywords = [{'keywords' => keywords, 'status_id' => status_id, 'done_ratio' => done_ratio}] end diff --git a/db/migrate/20141029181752_add_trackers_default_status_id.rb b/db/migrate/20141029181752_add_trackers_default_status_id.rb index 74716ea63..043be0c68 100644 --- a/db/migrate/20141029181752_add_trackers_default_status_id.rb +++ b/db/migrate/20141029181752_add_trackers_default_status_id.rb @@ -2,8 +2,8 @@ class AddTrackersDefaultStatusId < ActiveRecord::Migration[4.2] def up add_column :trackers, :default_status_id, :integer - status_id = IssueStatus.where(:is_default => true).pluck(:id).first - status_id ||= IssueStatus.order(:position).pluck(:id).first + status_id = IssueStatus.where(:is_default => true).pick(:id) + status_id ||= IssueStatus.order(:position).pick(:id) if status_id Tracker.update_all :default_status_id => status_id end diff --git a/db/migrate/20141029181824_remove_issue_statuses_is_default.rb b/db/migrate/20141029181824_remove_issue_statuses_is_default.rb index 09808e31c..94b518ea3 100644 --- a/db/migrate/20141029181824_remove_issue_statuses_is_default.rb +++ b/db/migrate/20141029181824_remove_issue_statuses_is_default.rb @@ -6,7 +6,7 @@ class RemoveIssueStatusesIsDefault < ActiveRecord::Migration[4.2] def down add_column :issue_statuses, :is_default, :boolean, :null => false, :default => false # Restores the first status as default - default_status_id = IssueStatus.order(:position).pluck(:id).first + default_status_id = IssueStatus.order(:position).pick(:id) IssueStatus.where(:id => default_status_id).update_all(:is_default => true) end end diff --git a/lib/redmine/nested_set/issue_nested_set.rb b/lib/redmine/nested_set/issue_nested_set.rb index 4b97e1c19..ba1c7a1de 100644 --- a/lib/redmine/nested_set/issue_nested_set.rb +++ b/lib/redmine/nested_set/issue_nested_set.rb @@ -147,7 +147,7 @@ module Redmine end def reload_nested_set_values - self.root_id, self.lft, self.rgt = self.class.where(:id => id).pluck(:root_id, :lft, :rgt).first + self.root_id, self.lft, self.rgt = self.class.where(:id => id).pick(:root_id, :lft, :rgt) end def save_nested_set_values diff --git a/lib/redmine/nested_set/project_nested_set.rb b/lib/redmine/nested_set/project_nested_set.rb index 13a63aca2..e7b680fd1 100644 --- a/lib/redmine/nested_set/project_nested_set.rb +++ b/lib/redmine/nested_set/project_nested_set.rb @@ -44,7 +44,7 @@ module Redmine if siblings_rgt siblings_rgt + 1 elsif parent_id - parent_lft = self.class.where(:id => parent_id).pluck(:lft).first + parent_lft = self.class.where(:id => parent_id).pick(:lft) unless parent_lft raise "Project id=#{id} with parent_id=#{parent_id}: parent missing or without 'lft' value" end @@ -136,7 +136,7 @@ module Redmine end def reload_nested_set_values - self.lft, self.rgt = Project.where(:id => id).pluck(:lft, :rgt).first + self.lft, self.rgt = Project.where(:id => id).pick(:lft, :rgt) end def save_nested_set_values |