github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Few UI improvements.

Browse Source 
fix #2928
This commit is contained in:
Antoine Nguyen
2023-04-21 11:08:47 +02:00
parent 699d4a0608
commit 794238bbdd
10 changed files with 67 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/domains/DomainForm.vue
+18 -13
View File
@@ -149,10 +149,10 @@
</v-expansion-panel>
</v-expansion-panels>
<div class="mt-4 d-flex justify-end">
<v-btn @click="$router.go(-1)">
<v-btn @click="$router.go(-1)" :loading="working">
<translate>Cancel</translate>
</v-btn>
<v-btn class="ml-4" color="primary darken-1" @click="save">
<v-btn class="ml-4" color="primary darken-1" @click="save" :loading="working">
<translate>Save</translate>
</v-btn>
</div>
@@ -187,7 +187,8 @@ export default {
return {
editedDomain: {},
limitsConfig: {},
panel: 0
panel: 0,
working: false
}
},
methods: {
@@ -204,16 +205,21 @@ export default {
return
}
}
const data = { ...this.editedDomain }
if (data.transport === null) {
delete data.transport
this.working = true
try {
const data = { ...this.editedDomain }
if (data.transport === null) {
delete data.transport
}
if (data.type === 'relaydomain') {
this.$refs.transportForm.checkSettingTypes(data)
}
this.$store.dispatch('domains/updateDomain', data).then(() => {
bus.$emit('notification', { msg: this.$gettext('Domain updated') })
})
} finally {
this.working = false
}
if (data.type === 'relaydomain') {
this.$refs.transportForm.checkSettingTypes(data)
}
this.$store.dispatch('domains/updateDomain', data).then(resp => {
bus.$emit('notification', { msg: this.$gettext('Domain updated') })
})
}
},
created () {
@@ -226,7 +232,6 @@ export default {
handler: function (val) {
if (val) {
this.editedDomain = JSON.parse(JSON.stringify(val))
console.log(this.editedDomain)
}
},
immediate: true
frontend/src/components/domains/DomainList.vue
+3 -1
View File
@@ -32,6 +32,7 @@
:expanded.sync="expanded"
@item-expanded="loadAliases"
@click:row="showAliases"
:loading="!domainsLoaded"
>
<template v-slot:item="{ item, isExpanded, expand }">
<tr>
@@ -158,7 +159,8 @@ export default {
MenuItems
},
computed: mapGetters({
domains: 'domains/domains'
domains: 'domains/domains',
domainsLoaded: 'domains/domainsLoaded'
}),
data () {
return {
frontend/src/components/identities/AccountCreationForm.vue
+4 -1
View File
@@ -171,6 +171,9 @@ export default {
return this.$refs[`form_${step}`].$refs.observer
},
validateAccount () {
if (this.account.mailbox.message_limit === '') {
this.$set(this.account.mailbox, 'message_limit', undefined)
}
return accounts.validate(this.account)
},
close () {
@@ -183,7 +186,7 @@ export default {
if (this.account.role === 'SuperAdmins' && this.account.username.indexOf('@') === -1) {
delete data.mailbox
}
accounts.create(data).then(resp => {
accounts.create(data).then(() => {
bus.$emit('notification', { msg: this.$gettext('Account created') })
this.$emit('created')
this.close()
frontend/src/components/identities/AccountForm.vue
+8 -4
View File
@@ -99,7 +99,7 @@
</v-expansion-panel-content>
</v-expansion-panel>
<v-expansion-panel
v-if="limitsConfig.params.enable_admin_limits && account.role !== 'SimpleUsers' && account.role !== 'SuperAdmins'"
v-if="limitsConfig.params && limitsConfig.params.enable_admin_limits && account.role !== 'SimpleUsers' && account.role !== 'SuperAdmins'"
>
<v-expansion-panel-header>
<v-row no-gutters>
@@ -114,10 +114,10 @@
</v-expansion-panel>
</v-expansion-panels>
<div class="mt-4 d-flex justify-end">
<v-btn @click="$router.go(-1)">
<v-btn @click="$router.go(-1)" :loading="working">
<translate>Cancel</translate>
</v-btn>
<v-btn class="ml-4" color="primary darken-1" @click="save">
<v-btn class="ml-4" color="primary darken-1" @click="save" :loading="working">
<translate>Save</translate>
</v-btn>
</div>
@@ -151,7 +151,8 @@ export default {
return {
editedAccount: {},
limitsConfig: {},
panel: 0
panel: 0,
working: false
}
},
methods: {
@@ -168,6 +169,7 @@ export default {
return
}
}
this.working = true
try {
const data = JSON.parse(JSON.stringify(this.editedAccount))
if (this.usernameIsEmail) {
@@ -201,6 +203,8 @@ export default {
if (this.$refs.resourcesForm) {
this.$refs.resourcesForm.$refs.observer.setErrors(error.response.data)
}
} finally {
this.working = false
}
}
},
frontend/src/components/identities/AliasForm.vue
+7 -3
View File
@@ -70,10 +70,10 @@
</v-expansion-panel>
</v-expansion-panels>
<div class="mt-4 d-flex justify-end">
<v-btn @click="$router.go(-1)">
<v-btn @click="$router.go(-1)" :loading="working">
<translate>Cancel</translate>
</v-btn>
<v-btn class="ml-4" color="primary darken-1" @click="save">
<v-btn class="ml-4" color="primary darken-1" @click="save" :loading="working">
<translate>Save</translate>
</v-btn>
</div>
@@ -95,7 +95,8 @@ export default {
data () {
return {
editedAlias: {},
panel: 0
panel: 0,
working: false
}
},
methods: {
@@ -106,6 +107,7 @@ export default {
return
}
}
this.working = true
try {
await aliases.patch(this.editedAlias.pk, this.editedAlias).then(resp => {
bus.$emit('notification', { msg: this.$gettext('Alias updated') })
@@ -114,6 +116,8 @@ export default {
if (this.$refs.generalForm) {
this.$refs.generalForm.$refs.observer.setErrors(error.response.data)
}
} finally {
this.working = false
}
}
},
frontend/src/components/identities/AliasGeneralForm.vue
+11 -2
View File
@@ -99,8 +99,17 @@ export default {
this.$emit('input', this.form)
}
},
mounted () {
this.form = { ...this.value }
watch: {
value: {
handler (newValue) {
if (newValue) {
this.form = { ...newValue }
} else {
this.form = {}
}
},
immediate: true
}
}
}
</script>
frontend/src/components/identities/IdentityList.vue
+3
View File
@@ -28,6 +28,7 @@
:headers="headers"
:items="identities"
:search="search"
:loading="loading"
item-key="identity"
class="elevation-1"
show-select
@@ -102,6 +103,7 @@ export default {
],
identities: [],
keepAccountFolder: false,
loading: true,
search: '',
selected: []
}
@@ -203,6 +205,7 @@ export default {
identities.getAll().then(resp => {
this.identities = resp.data
this.selected = []
this.loading = false
})
},
downloadFile (options) {
frontend/src/components/layout/Navbar.vue
+3 -2
View File
@@ -79,7 +79,7 @@
</template>
</v-list>
<template v-slot:append>
<v-menu rounded="lg" offset-y top>
<v-menu rounded="lg" offset-y top v-if="isAuthenticated">
<template v-slot:activator="{ attrs, on }">
<div class="d-flex user-box justify-center align-center white--text py-2" v-bind="attrs" v-on="on">
<v-avatar size="40" color="primary">
@@ -120,7 +120,8 @@ import { mapGetters } from 'vuex'
export default {
computed: {
...mapGetters({
authUser: 'auth/authUser'
authUser: 'auth/authUser',
isAuthenticated: 'auth/isAuthenticated'
}),
userInitials () {
let initials = null
frontend/src/components/tools/CreationForm.vue
+9 -2
View File
@@ -57,8 +57,9 @@
<div class="d-flex justify-center mt-8">
<v-btn
color="primary"
@click="$emit('create')"
@click="create"
large
:loading="working"
>
<translate>Confirm and create</translate>
</v-btn>
@@ -89,12 +90,14 @@ export default {
},
data () {
return {
currentStep: 1
currentStep: 1,
working: false
}
},
methods: {
resetForm () {
this.currentStep = 1
this.working = false
this.steps.forEach((item, index) => {
const observer = this.formObserverGetter(index + 1)
if (observer !== undefined) {
@@ -139,6 +142,10 @@ export default {
}
}
this.currentStep = next
},
create () {
this.working = true
this.$emit('create')
}
}
}
frontend/src/store/modules/domains.js
+1
View File
@@ -16,6 +16,7 @@ const state = {
// getters
const getters = {
domains: state => state.domains,
domainsLoaded: state => state.domainsLoaded,
getDomainByPk: state => pk => {
for (const domain of state.domains) {
if (domain.pk === parseInt(pk, 10)) {