diff --git a/raw-cms-app/src/modules/core/assets/i18n/i18n.en.json b/raw-cms-app/src/modules/core/assets/i18n/i18n.en.json index d778dec7..54a188ee 100644 --- a/raw-cms-app/src/modules/core/assets/i18n/i18n.en.json +++ b/raw-cms-app/src/modules/core/assets/i18n/i18n.en.json @@ -35,7 +35,6 @@ "fields": "Fields", "name": "Name", "newTitle": "New entity", - "requiredNameMsg": "Name is required", "updateTitle": "Entity {name}", "fieldEdit": { "nameLabel": "Name", @@ -68,7 +67,7 @@ "deleteConfirmMsgTpl": "Are you sure you want to delete lambda {name}?", "deleteErrorMsgTpl": "An error occurred while deleting lambda {name}.", "deleteSuccessMsgTpl": "Lambda {name} was deleted.", - "emptyMsg": "There are no lambdas yet. Add some with the button below!", + "empt1yMsg": "There are no lambdas yet. Add some with the button below!", "title": "Lambdas", "details": { "nameLabel": "Name", @@ -92,7 +91,12 @@ "users": { "detail": { "newTitle": "New user", - "updateTitle": "User {name}" + "newEmail": "New Email", + "newRoles": "New Roles", + "updateTitle": "User {name}", + "requiredNameMsg": "Name is required", + "requiredEmailMsg": "Email is required", + "requiredRoleslMsg": "Roles is required" }, "deleteConfirmMsgTpl": "Are you sure you want to delete user {name}?", "deleteErrorMsgTpl": "An error occurred while deleting user {name}.", diff --git a/raw-cms-app/src/modules/core/components/user-details/user-details.js b/raw-cms-app/src/modules/core/components/user-details/user-details.js index 6ba3775a..8233c0ac 100644 --- a/raw-cms-app/src/modules/core/components/user-details/user-details.js +++ b/raw-cms-app/src/modules/core/components/user-details/user-details.js @@ -7,7 +7,9 @@ const _UserDetailsWrapperDef = async () => { return { data: function() { return { + activeTabId: 'tabFormly', apiService: userService, + userRoles: this.$slots, }; }, extends: rawCmsDetailEditDef, @@ -24,6 +26,18 @@ const _UserDetailsDef = async () => { components: { DetailWrapper: detailWrapperDef, }, + data: function() { + return { + nameRules: [v => !!v || this.$t('core.users.detail.requiredNameMsg')], + emailRules: [v => !!v || this.$t('core.users.detail.requiredEmailMsg')], + emailRules: [v => !!v || this.$t('core.users.detail.requiredRoleslMsg')], + }; + }, + computed: { + userRoles: function() { + return this.$slots; + }, + }, props: detailWrapperDef.extends.props, template: tpl, }; diff --git a/raw-cms-app/src/modules/core/components/user-details/user-details.tpl.html b/raw-cms-app/src/modules/core/components/user-details/user-details.tpl.html index fed0ec2f..e1db70a3 100644 --- a/raw-cms-app/src/modules/core/components/user-details/user-details.tpl.html +++ b/raw-cms-app/src/modules/core/components/user-details/user-details.tpl.html @@ -1 +1,47 @@ - + + + + +