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

Fixes after review of beta2

Browse Source
This commit is contained in:
Antoine Nguyen
2024-07-18 12:13:31 +02:00
parent 3ec023fa23
commit fa099382d1
10 changed files with 103 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/upgrade.rst
+1 -1
View File
@@ -269,7 +269,7 @@ by default.
'OIDC_ENABLED': True,
'OIDC_RP_INITIATED_LOGOUT_ENABLED': True,
'OIDC_RP_INITIATED_LOGOUT_ALWAYS_PROMPT': True,
'OIDC_RSA_PRIVATE_KEY': env('OIDC_RSA_PRIVATE_KEY'),
'OIDC_RSA_PRIVATE_KEY': env.str('OIDC_RSA_PRIVATE_KEY', multiline=True),
'SCOPES': {
'openid': 'OpenID Connect scope',
'read': 'Read scope',
frontend/src/components/admin/dmarc/DmarcAligmentChart.vue
+3 -3
View File
@@ -2,7 +2,7 @@
<div v-if="alignments">
<v-card>
<v-toolbar dense elevation="0" class="mr-2">
<v-toolbar-title>$gettext('Alignment')</v-toolbar-title>
<v-toolbar-title>{{ $gettext('Alignment') }}</v-toolbar-title>
<v-spacer />
<v-btn icon="mdi-arrow-left" size="x-small" @click="previousWeek">
</v-btn>
@@ -153,8 +153,8 @@ const boxes = ref([
])
const now = DateTime.now()
const currentWeek = ref(now.year)
const currentYear = ref(now.weekNumber)
const currentYear = ref(now.year)
const currentWeek = ref(now.weekNumber)
const dmarcDisabled = ref(false)
const loading = ref(false)
const panel = ref(null)
frontend/src/layouts/dashboard/DashboardLayout.vue
+6
View File
@@ -42,3 +42,9 @@ busStore.$onAction(({ name, after }) => {
}
}, true)
</script>
<style>
.v-application {
background-color: #f7f8fa;
}
</style>
frontend/src/views/admin/ParametersView.vue
+55 -53
View File
@@ -19,59 +19,61 @@
v-for="element in displayableElements"
:key="element.label"
>
<v-card>
<v-card-text>
<template
v-for="param in displayableParams(element.parameters)"
:key="param.name"
>
<div class="my-4">
<template v-if="param.widget === 'SeparatorField'">
<h2>{{ param.label }}</h2>
</template>
<template v-else-if="param.widget === 'BooleanField'">
<v-switch
v-if="param.widget === 'BooleanField'"
v-model="parameters[param.name]"
:label="param.label"
:hint="param.help_text"
:error="formErrors[param.name] !== undefined"
color="primary"
density="compact"
:error-messages="formErrors[param.name]"
persistent-hint
/>
</template>
<template v-else>
<label class="m-label">{{ param.label }}</label>
<v-select
v-if="param.widget === 'ChoiceField'"
v-model="parameters[param.name]"
:items="param.choices"
item-title="text"
:hint="param.help_text"
persistent-hint
density="compact"
variant="outlined"
/>
<v-text-field
v-else
v-model="parameters[param.name]"
:hint="param.help_text"
persistent-hint
:error="formErrors[param.name] !== undefined"
:error-messages="formErrors[param.name]"
:type="
param.widget === 'PasswordField' ? 'password' : 'text'
"
density="compact"
variant="outlined"
/>
</template>
</div>
</template>
</v-card-text>
</v-card>
<v-container fluid class="pa-0">
<v-card>
<v-card-text>
<template
v-for="param in displayableParams(element.parameters)"
:key="param.name"
>
<div class="my-4">
<template v-if="param.widget === 'SeparatorField'">
<h2>{{ param.label }}</h2>
</template>
<template v-else-if="param.widget === 'BooleanField'">
<v-switch
v-if="param.widget === 'BooleanField'"
v-model="parameters[param.name]"
:label="param.label"
:hint="param.help_text"
:error="formErrors[param.name] !== undefined"
color="primary"
density="compact"
:error-messages="formErrors[param.name]"
persistent-hint
/>
</template>
<template v-else>
<label class="m-label">{{ param.label }}</label>
<v-select
v-if="param.widget === 'ChoiceField'"
v-model="parameters[param.name]"
:items="param.choices"
item-title="text"
:hint="param.help_text"
persistent-hint
density="compact"
variant="outlined"
/>
<v-text-field
v-else
v-model="parameters[param.name]"
:hint="param.help_text"
persistent-hint
:error="formErrors[param.name] !== undefined"
:error-messages="formErrors[param.name]"
:type="
param.widget === 'PasswordField' ? 'password' : 'text'
"
density="compact"
variant="outlined"
/>
</template>
</div>
</template>
</v-card-text>
</v-card>
</v-container>
</v-tabs-window-item>
</v-tabs-window>
<v-btn
frontend/src/views/admin/domains/DomainEditView.vue
+10 -5
View File
@@ -1,9 +1,8 @@
<template>
<div>
<span class="text-h4">{{ $gettext('Edit domain') }}</span>
<div class="mt-4" />
<DomainEditForm :domain="domain" />
</div>
<v-toolbar flat>
<v-toolbar-title>{{ $gettext('Edit domain') }}</v-toolbar-title>
</v-toolbar>
<DomainEditForm :domain="domain" />
</template>
<script setup lang="js">
@@ -23,3 +22,9 @@ domainsStore
.getDomain(route.params.id)
.then((response) => (domain.value = response.data))
</script>
<style scoped>
.v-toolbar {
background-color: #f7f8fa !important;
}
</style>
frontend/src/views/admin/domains/DomainView.vue
+7
View File
@@ -27,6 +27,7 @@
{{ $gettext('DMARC') }}
</v-tab>
</v-tabs>
<v-tabs-window v-model="tab">
<v-tabs-window-item>
<v-row>
@@ -117,3 +118,9 @@ function refreshDomain() {
background-color: #f7f8fa !important;
}
</style>
<style>
.v-window__container {
width: 100% !important;
}
</style>
frontend/src/views/admin/identities/AccountEditView.vue
+9 -2
View File
@@ -1,6 +1,7 @@
<template>
<span class="text-h4">{{ $gettext('Edit account') }}</span>
<div class="mt-4" />
<v-toolbar flat>
<v-toolbar-title>{{ $gettext('Edit account') }}</v-toolbar-title>
</v-toolbar>
<AccountEditForm />
</template>
@@ -10,3 +11,9 @@ import { useGettext } from 'vue3-gettext'
const { $gettext } = useGettext()
</script>
<style scoped>
.v-toolbar {
background-color: #f7f8fa !important;
}
</style>
frontend/src/views/admin/identities/AliasEditView.vue
+10 -5
View File
@@ -1,9 +1,8 @@
<template>
<div>
<span class="text-h4">{{ $gettext('Edit alias') }}</span>
<div class="mt-4" />
<AliasEditForm :alias="alias" />
</div>
<v-toolbar flat>
<v-toolbar-title>{{ $gettext('Edit alias') }}</v-toolbar-title>
</v-toolbar>
<AliasEditForm :alias="alias" />
</template>
<script setup lang="js">
@@ -12,3 +11,9 @@ import { useGettext } from 'vue3-gettext'
const { $gettext } = useGettext()
</script>
<style scoped>
.v-toolbar {
background-color: #f7f8fa !important;
}
</style>
modoboa/core/commands/templates/settings.py.tpl
+1 -1
View File
@@ -206,7 +206,7 @@ OAUTH2_PROVIDER = {
'OIDC_ENABLED': True,
'OIDC_RP_INITIATED_LOGOUT_ENABLED': True,
'OIDC_RP_INITIATED_LOGOUT_ALWAYS_PROMPT': True,
'OIDC_RSA_PRIVATE_KEY': env('OIDC_RSA_PRIVATE_KEY'),
'OIDC_RSA_PRIVATE_KEY': env.str('OIDC_RSA_PRIVATE_KEY', multiline=True),
'SCOPES': {
'openid': 'OpenID Connect scope',
'read': 'Read scope',
requirements.txt
+1 -1
View File
@@ -53,4 +53,4 @@ rq>=1.13.0
django-rq
# Sieve
sievelib>=1.4
sievelib>=1.4.1