From 143eafa24ad4da286a6f4f4f52eb2b958821a9b6 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Sat, 28 Sep 2024 13:07:46 +0200 Subject: [PATCH] updated model editors to composable and base template --- cookbook/views/api.py | 2 +- .../dialogs/DeleteConfirmDialog.vue | 6 +- .../model_editors/AccessTokenEditor.vue | 66 +++------ .../model_editors/InviteLinkEditor.vue | 108 +++------------ .../model_editors/MealTypeEditor.vue | 120 ++++------------ .../model_editors/ModelEditorBase.vue | 41 ++++++ .../model_editors/PropertyEditor.vue | 119 +++------------- .../model_editors/UnitConversionEditor.vue | 128 ++++-------------- .../model_editors/UserSpaceEditor.vue | 97 ++++--------- .../composables/useModelEditorFunctions.ts | 95 +++++++++++-- vue3/src/locales/ar.json | 4 + vue3/src/locales/bg.json | 4 + vue3/src/locales/ca.json | 4 + vue3/src/locales/cs.json | 4 + vue3/src/locales/da.json | 4 + vue3/src/locales/de.json | 4 + vue3/src/locales/el.json | 4 + vue3/src/locales/en.json | 2 + vue3/src/locales/es.json | 4 + vue3/src/locales/fi.json | 4 + vue3/src/locales/fr.json | 4 + vue3/src/locales/he.json | 4 + vue3/src/locales/hu.json | 4 + vue3/src/locales/hy.json | 4 + vue3/src/locales/id.json | 4 + vue3/src/locales/is.json | 4 + vue3/src/locales/it.json | 4 + vue3/src/locales/lt.json | 4 + vue3/src/locales/nb_NO.json | 4 + vue3/src/locales/nl.json | 4 + vue3/src/locales/pl.json | 4 + vue3/src/locales/pt.json | 4 + vue3/src/locales/pt_BR.json | 4 + vue3/src/locales/ro.json | 4 + vue3/src/locales/ru.json | 4 + vue3/src/locales/sl.json | 4 + vue3/src/locales/sv.json | 4 + vue3/src/locales/tr.json | 4 + vue3/src/locales/uk.json | 4 + vue3/src/locales/zh_Hans.json | 4 + vue3/src/locales/zh_Hant.json | 4 + vue3/src/openapi/apis/ApiApi.ts | 50 +++++++ vue3/src/types/Models.ts | 99 +++++++++++++- 43 files changed, 531 insertions(+), 522 deletions(-) create mode 100644 vue3/src/components/model_editors/ModelEditorBase.vue diff --git a/cookbook/views/api.py b/cookbook/views/api.py index 05190dd14..b65d776af 100644 --- a/cookbook/views/api.py +++ b/cookbook/views/api.py @@ -475,7 +475,7 @@ class UserSpaceViewSet(viewsets.ModelViewSet): queryset = UserSpace.objects serializer_class = UserSpaceSerializer permission_classes = [(CustomIsSpaceOwner | CustomIsOwnerReadOnly) & CustomTokenHasReadWriteScope] - http_method_names = ['get', 'patch', 'delete'] + http_method_names = ['get', 'put', 'patch', 'delete'] pagination_class = DefaultPagination def destroy(self, request, *args, **kwargs): diff --git a/vue3/src/components/dialogs/DeleteConfirmDialog.vue b/vue3/src/components/dialogs/DeleteConfirmDialog.vue index 20ad4e61b..b57e3da69 100644 --- a/vue3/src/components/dialogs/DeleteConfirmDialog.vue +++ b/vue3/src/components/dialogs/DeleteConfirmDialog.vue @@ -4,7 +4,8 @@ {{ $t('Delete') }} - {{ $t('DeleteConfirmQuestion')}} + {{ $t('DeleteConfirmQuestion')}}
+ {{ modelName }}
{{ objectName }}
@@ -25,7 +26,8 @@ import {ref} from "vue"; const emit = defineEmits(['delete']) const props = defineProps({ - objectName: {type: String, default: ''} + objectName: {type: String, default: ''}, + modelName: {type: String, default: ''}, }) const dialog = ref(false) diff --git a/vue3/src/components/model_editors/AccessTokenEditor.vue b/vue3/src/components/model_editors/AccessTokenEditor.vue index 302237d73..fba49ba23 100644 --- a/vue3/src/components/model_editors/AccessTokenEditor.vue +++ b/vue3/src/components/model_editors/AccessTokenEditor.vue @@ -1,9 +1,13 @@ \ No newline at end of file diff --git a/vue3/src/components/model_editors/PropertyEditor.vue b/vue3/src/components/model_editors/PropertyEditor.vue index d2c994ce1..e4fa399fa 100644 --- a/vue3/src/components/model_editors/PropertyEditor.vue +++ b/vue3/src/components/model_editors/PropertyEditor.vue @@ -1,10 +1,13 @@ diff --git a/vue3/src/components/model_editors/UnitConversionEditor.vue b/vue3/src/components/model_editors/UnitConversionEditor.vue index 35b2e9670..bdfe87533 100644 --- a/vue3/src/components/model_editors/UnitConversionEditor.vue +++ b/vue3/src/components/model_editors/UnitConversionEditor.vue @@ -1,15 +1,18 @@