Fixes DEPRECATION WARNING-s for Rails 5.1.2

This just fixes the warning messages occured during click-through
of the application. I didn't systematically search code for all
potential problems (I couldn't find the list of all deprecations
anyway).

Closes SCI-1427.
This commit is contained in:
Luka Murn 2017-07-04 14:35:51 +02:00
parent 5f4006fe4a
commit 91cddce8a6
4 changed files with 7 additions and 6 deletions

View file

@ -12,7 +12,8 @@ class MyModule < ApplicationRecord
validates :description, length: { maximum: Constants::TEXT_MAX_LENGTH }
validates :x, :y, :workflow_order, presence: true
validates :experiment, presence: true
validates :my_module_group, presence: true, if: "!my_module_group_id.nil?"
validates :my_module_group, presence: true,
if: proc { |mm| !mm.my_module_group_id.nil? }
belongs_to :created_by,
foreign_key: 'created_by_id',

View file

@ -669,9 +669,9 @@ class Protocol < ApplicationRecord
def update_linked_children
# Increment/decrement the parent's nr of linked children
if self.parent_id_changed?
if self.parent_id_was != nil
p = Protocol.find_by_id(self.parent_id_was)
if self.saved_change_to_parent_id?
if self.parent_id_before_last_save != nil
p = Protocol.find_by_id(self.parent_id_before_last_save)
p.record_timestamps = false
p.decrement!(:nr_of_linked_children)
end

View file

@ -9,7 +9,7 @@ class Step < ApplicationRecord
validates :position, presence: true
validates :completed, inclusion: { in: [true, false] }
validates :user, :protocol, presence: true
validates :completed_on, presence: true, if: "completed?"
validates :completed_on, presence: true, if: proc { |s| s.completed? }
belongs_to :user, inverse_of: :steps, optional: true
belongs_to :last_modified_by,

View file

@ -120,7 +120,7 @@ class Table < ApplicationRecord
end
def update_ts_index
if contents_changed?
if saved_change_to_contents?
sql = "UPDATE tables " +
"SET data_vector = " +
"to_tsvector(substring(encode(contents::bytea, 'escape'), 9)) " +