Fixed issue with empty passwords for groups
• Fixed: - issue with empty passwords for groups
This commit is contained in:
parent
a842bfb20b
commit
5cb35c7b31
|
@ -56,6 +56,7 @@ class Group < ApplicationRecord
|
||||||
record.errors.add(:base, I18n.t('groups.errors.limit')) if Group.where(account_id: value).count >= PER_ACCOUNT_LIMIT
|
record.errors.add(:base, I18n.t('groups.errors.limit')) if Group.where(account_id: value).count >= PER_ACCOUNT_LIMIT
|
||||||
end
|
end
|
||||||
|
|
||||||
|
before_save :set_password
|
||||||
before_destroy :clean_feed_manager
|
before_destroy :clean_feed_manager
|
||||||
after_create :add_owner_to_accounts
|
after_create :add_owner_to_accounts
|
||||||
|
|
||||||
|
@ -72,6 +73,13 @@ class Group < ApplicationRecord
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
def set_password
|
||||||
|
if password.nil? || !password || password.gsub(/\s+/, "").length <= 1 || password == "null"
|
||||||
|
nil
|
||||||
|
else
|
||||||
|
password
|
||||||
|
end
|
||||||
|
end
|
||||||
def add_owner_to_accounts
|
def add_owner_to_accounts
|
||||||
group_accounts << GroupAccount.new(account: account, role: :admin, write_permissions: true)
|
group_accounts << GroupAccount.new(account: account, role: :admin, write_permissions: true)
|
||||||
end
|
end
|
||||||
|
|
|
@ -12,7 +12,7 @@ class REST::GroupSerializer < ActiveModel::Serializer
|
||||||
end
|
end
|
||||||
|
|
||||||
def has_password
|
def has_password
|
||||||
return !!object.password
|
return !!object.password && object.password.gsub(/\s+/, "").length > 1 && object.password.to_s != "null"
|
||||||
end
|
end
|
||||||
|
|
||||||
def password
|
def password
|
||||||
|
|
Loading…
Reference in New Issue