From 5e8f0c4d775db8d1d69a9ecd8f80a3018ba9d5f4 Mon Sep 17 00:00:00 2001 From: Brandon Dunne Date: Mon, 26 Mar 2018 16:11:17 -0400 Subject: [PATCH] Merge pull request #17197 from hstastna/Duplicate_RBAC_Role_Group_names_capitalization Add case insensitivity when validating uniqueness of name of new group/role (cherry picked from commit ad57f99c011037384f8415ef6ae8ad41f75d81a8) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1561076 --- app/models/miq_group.rb | 2 +- app/models/miq_user_role.rb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/miq_group.rb b/app/models/miq_group.rb index eab91e1f5e8..1c6b1dedc83 100644 --- a/app/models/miq_group.rb +++ b/app/models/miq_group.rb @@ -19,7 +19,7 @@ class MiqGroup < ApplicationRecord delegate :self_service?, :limited_self_service?, :disallowed_roles, :to => :miq_user_role, :allow_nil => true - validates :description, :presence => true, :unique_within_region => true + validates :description, :presence => true, :unique_within_region => { :match_case => false } validate :validate_default_tenant, :on => :update, :if => :tenant_id_changed? before_destroy :ensure_can_be_destroyed after_destroy :reset_current_group_for_users diff --git a/app/models/miq_user_role.rb b/app/models/miq_user_role.rb index aa4db4de9ae..037fcd33285 100644 --- a/app/models/miq_user_role.rb +++ b/app/models/miq_user_role.rb @@ -9,8 +9,7 @@ class MiqUserRole < ApplicationRecord virtual_column :vm_restriction, :type => :string - validates_presence_of :name - validates_uniqueness_of :name + validates :name, :presence => true, :uniqueness => { :case_sensitive => false } serialize :settings