This repository was archived by the owner on Apr 10, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 71
244 #256
Open
chan18
wants to merge
5
commits into
arduosoft:master
Choose a base branch
from
chan18:244
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
244 #256
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
a721a81
Merge pull request #6 from arduosoft/develop
chan18 b18a34f
Merge pull request #7 from arduosoft/develop
chan18 f1a08a2
Merge pull request #8 from arduosoft/develop
chan18 bbbbe7b
Merge pull request #9 from arduosoft/develop
chan18 0169374
User management
chan18 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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')], | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why the rule for role has emailRules name? |
||
}; | ||
}, | ||
computed: { | ||
userRoles: function() { | ||
return this.$slots; | ||
}, | ||
}, | ||
props: detailWrapperDef.extends.props, | ||
template: tpl, | ||
}; | ||
|
48 changes: 47 additions & 1 deletion
48
raw-cms-app/src/modules/core/components/user-details/user-details.tpl.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,47 @@ | ||
<detail-wrapper v-on="$listeners" v-bind="$props"></detail-wrapper> | ||
<detail-wrapper v-on="$listeners" v-bind="$props"> | ||
<template slot="custom-tabs"> | ||
<v-tab href="#tabFormly"> | ||
{{ $t('core.common.editText') }} | ||
<v-icon>mdi-pen</v-icon> | ||
</v-tab> | ||
</template> | ||
|
||
<template v-slot:custom-tab-items="{ value }"> | ||
<v-tab-item value="tabFormly"> | ||
<v-card flat tile> | ||
<v-form> | ||
<v-container fluid> | ||
<v-row class="px-3"> | ||
<v-col cols="12" sm="6"> | ||
<v-text-field | ||
v-model="value.UserName" | ||
:rules="nameRules" | ||
:label="$t('core.users.detail.newTitle')" | ||
required | ||
></v-text-field> | ||
</v-col> | ||
<v-col cols="12" sm="6"> | ||
<v-text-field | ||
v-model="value.Email" | ||
:rules="emailRules" | ||
:label="$t('core.users.detail.newEmail')" | ||
required | ||
></v-text-field> | ||
</v-col> | ||
</v-row> | ||
<v-row class="px-3"> | ||
<v-col> | ||
<v-text-field | ||
v-model="value.Roles.join(',')" | ||
:rules="roleRules" | ||
:label="$t('core.users.detail.newRoles')" | ||
required | ||
></v-text-field> | ||
</v-col> | ||
</v-row> | ||
</v-container> | ||
</v-form> | ||
</v-card> | ||
</v-tab-item> | ||
</template> | ||
</detail-wrapper> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
typo error?