diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java index 8a469df1f1f..e67a3e2c0a0 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java @@ -48,8 +48,7 @@ public class CreateRoleCmd extends RoleCmd { description = "ID of the role to be cloned from. Either roleid or type must be passed in") private Long roleId; - @Parameter(name = ApiConstants.IS_PUBLIC, type = CommandType.BOOLEAN, description = "Indicates whether the role will be visible to all users (public) or only to root admins (private)." + - " If this parameter is not specified during the creation of the role its value will be defaulted to true (public).") + @Parameter(name = ApiConstants.IS_PUBLIC, type = CommandType.BOOLEAN, description = "Indicates whether the role will be visible to all users (public) or only to root admins (private). Default is true.") private boolean publicRole = true; ///////////////////////////////////////////////////// diff --git a/ui/src/config/section/role.js b/ui/src/config/section/role.js index a040615b9e1..5196d2ad98d 100644 --- a/ui/src/config/section/role.js +++ b/ui/src/config/section/role.js @@ -23,7 +23,7 @@ export default { docHelp: 'adminguide/accounts.html#roles', permission: ['listRoles', 'listRolePermissions'], columns: ['name', 'type', 'description'], - details: ['name', 'id', 'type', 'description'], + details: ['name', 'id', 'type', 'description', 'ispublic'], tabs: [{ name: 'details', component: shallowRef(defineAsyncComponent(() => import('@/components/view/DetailsTab.vue'))) @@ -53,7 +53,7 @@ export default { icon: 'edit-outlined', label: 'label.edit.role', dataView: true, - args: ['name', 'description', 'type'], + args: ['name', 'description', 'type', 'ispublic'], mapping: { type: { options: ['Admin', 'DomainAdmin', 'User'] diff --git a/ui/src/views/iam/CreateRole.vue b/ui/src/views/iam/CreateRole.vue index d0ec8bea754..e3513b62a3f 100644 --- a/ui/src/views/iam/CreateRole.vue +++ b/ui/src/views/iam/CreateRole.vue @@ -99,6 +99,13 @@ + + + + +
{{ $t('label.cancel') }} {{ $t('label.ok') }} @@ -150,7 +157,8 @@ export default { initForm () { this.formRef = ref() this.form = reactive({ - using: 'type' + using: 'type', + ispublic: true }) this.rules = reactive({ name: [{ required: true, message: this.$t('message.error.required.input') }], diff --git a/ui/src/views/iam/ImportRole.vue b/ui/src/views/iam/ImportRole.vue index 991912796f2..85778724474 100644 --- a/ui/src/views/iam/ImportRole.vue +++ b/ui/src/views/iam/ImportRole.vue @@ -80,6 +80,13 @@ + + + + +