From a5d76e5d7c6179acdc00092497e09edfe97a69b3 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 29 Mar 2021 15:55:44 +0100
Subject: [PATCH] Fix changes after rebase with master - added in role
 desciption again given changes to checkbox - added tooltip again given
 changes to role checkbox label slot

---
 components/GlobalRoleBindings.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/components/GlobalRoleBindings.vue b/components/GlobalRoleBindings.vue
index 3c1f9fbe2b..7001debbcf 100644
--- a/components/GlobalRoleBindings.vue
+++ b/components/GlobalRoleBindings.vue
@@ -310,13 +310,16 @@ export default {
                   v-model="selectedRoles"
                   :value-when-true="role.id"
                   :disabled="!!assignOnlyRoles[role.id]"
-                  :tooltip-key="!!assignOnlyRoles[role.id] ? 'rbac.globalRoles.assignOnlyRole' : ''"
                   :label="role.nameDisplay"
+                  :description="role.description"
                   :mode="mode"
                   @input="checkboxChanged"
                 >
                   <template #label>
-                    <span class="checkbox-label">{{ role.nameDisplay }}</span>
+                    <div class="checkbox-label-slot">
+                      <span class="checkbox-label">{{ role.nameDisplay }}</span>
+                      <i v-if="!!assignOnlyRoles[role.id]" v-tooltip="t('rbac.globalRoles.assignOnlyRole')" class="checkbox-info icon icon-info icon-lg" />
+                    </div>
                   </template>
                 </Checkbox>
               </div>
@@ -354,7 +357,11 @@ export default {
         grid-template-columns: 100%;
       }
 
-      .checkbox-label{
+      .checkbox-label {
+        &-slot {
+          display: inline-flex;
+          align-items: center;
+        }
         color: var(--body-text);
         margin: 0;
       }