diff --git a/app/helpers/additionals_queries_helper.rb b/app/helpers/additionals_queries_helper.rb index 94a1d5f6..187ec1a1 100644 --- a/app/helpers/additionals_queries_helper.rb +++ b/app/helpers/additionals_queries_helper.rb @@ -284,15 +284,11 @@ module AdditionalsQueriesHelper return false if token.blank? || !token.is_a?(String) # Match http, https or ftp URL - if %r{\A[fh]tt?ps?://}.match?(token) || - # Match mailto: - token.start_with?('mailto:') || - # Match internal or external sheet link - /\A(?:in|ex)ternal:/.match?(token) - true - end - - false + %r{\A[fh]tt?ps?://}.match?(token) || + # Match mailto: + token.start_with?('mailto:') || + # Match internal or external sheet link + /\A(?:in|ex)ternal:/.match?(token) end def set_flash_from_bulk_save(entries, unsaved_ids, name_plural:) diff --git a/app/models/dashboard.rb b/app/models/dashboard.rb index d2cf2279..38938d40 100644 --- a/app/models/dashboard.rb +++ b/app/models/dashboard.rb @@ -182,9 +182,9 @@ class Dashboard < ActiveRecord::Base else user.memberships.joins(:member_roles).where(member_roles: { role_id: roles.map(&:id) }).any? end + else + false end - - false end def content