mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-10-19 05:58:34 +02:00
Some updates
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
:items-length="totalIdentities"
|
||||
:page="currentPage"
|
||||
:items-per-page="itemsPerPageR"
|
||||
item-value="key"
|
||||
item-value="pk"
|
||||
elevation="0"
|
||||
show-select
|
||||
:sort-by="sortByR"
|
||||
@@ -35,7 +35,7 @@
|
||||
:title="$gettext('Customize displayed columns')"
|
||||
@click="showColumnsForm = true"
|
||||
></v-btn>
|
||||
<v-menu location="bottom">
|
||||
<v-menu v-if="selected.length > 1" location="bottom">
|
||||
<template #activator="{ props }">
|
||||
<v-btn
|
||||
append-icon="mdi-chevron-down"
|
||||
@@ -157,6 +157,7 @@
|
||||
<ChooseColumnsForm
|
||||
:columns="columns"
|
||||
:available-columns="currentAvailableColumns"
|
||||
:mandatory-columns="mandatoryColumns"
|
||||
@apply="updateDisplayedColumns"
|
||||
/>
|
||||
</v-dialog>
|
||||
@@ -294,8 +295,16 @@ const currentAvailableColumns = computed(() => {
|
||||
}
|
||||
})
|
||||
|
||||
const mandatoryColumns = computed(() => {
|
||||
if (identityType.value === 'account') {
|
||||
return ['username']
|
||||
}
|
||||
return ['address']
|
||||
})
|
||||
|
||||
async function updateType(value) {
|
||||
loading.value = true
|
||||
identities.value = []
|
||||
sortByR.value = []
|
||||
if (value === 'account') {
|
||||
columns.value = defaultAccountsColumns
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
color="primary"
|
||||
hide-details
|
||||
density="compact"
|
||||
:disabled="props.mandatoryColumns.includes(column.key)"
|
||||
/>
|
||||
</div>
|
||||
</v-card-text>
|
||||
@@ -27,6 +28,10 @@ const props = defineProps({
|
||||
type: Array,
|
||||
default: null,
|
||||
},
|
||||
mandatoryColumns: {
|
||||
type: Array,
|
||||
default: null,
|
||||
},
|
||||
columns: {
|
||||
type: Array,
|
||||
default: null,
|
||||
|
||||
@@ -119,14 +119,14 @@ class Command(BaseCommand):
|
||||
redirect_uris = " ".join([f"{uri}/login/logged" for uri in base_uris_list])
|
||||
redirect_uri = redirect_uris.split(" ")[0]
|
||||
client_id = ""
|
||||
if options["dev"]:
|
||||
base_uri = "https://localhost:3000/"
|
||||
base_uris = base_uri
|
||||
redirect_uri = "https://localhost:3000/login/logged"
|
||||
redirect_uris = redirect_uri
|
||||
client_id = "LVQbfIIX3khWR3nDvix1u9yEGHZUxcx53bhJ7FlD"
|
||||
if not frontend_application.exists():
|
||||
if options["dev"]:
|
||||
base_uri = "https://localhost:3000/"
|
||||
base_uris = base_uri
|
||||
redirect_uri = "https://localhost:3000/login/logged"
|
||||
redirect_uris = redirect_uri
|
||||
client_id = "LVQbfIIX3khWR3nDvix1u9yEGHZUxcx53bhJ7FlD"
|
||||
else:
|
||||
if not options["dev"]:
|
||||
client_id = str(uuid.uuid4())
|
||||
call_command(
|
||||
"createapplication",
|
||||
|
||||
Reference in New Issue
Block a user