From e5c7e003a06f180ccaec6d35fcf9edea5a3a2e96 Mon Sep 17 00:00:00 2001 From: "adel.ka" Date: Thu, 6 Mar 2025 10:40:44 +0300 Subject: [PATCH] SUPPORT-8956: fixPages --- ...Value.ts => SetCurrentUserIdAsDefValue.ts} | 5 +- .../Обработка заявки на добавление пользователя.page | 56 +++++++++---------- .../Создание заявки на добавление пользователя.page | 18 +++--- .../Создать заявку на деактивацию.page | 3 +- .../Создать заявку на изменение.page | 34 +++-------- .../Список заявок.page | 22 ++++---- 6 files changed, 61 insertions(+), 77 deletions(-) rename frontend/src/ts/account_applications/scripts/{SetCurrentRecruitmentIdAsDefValue.ts => SetCurrentUserIdAsDefValue.ts} (83%) diff --git a/frontend/src/ts/account_applications/scripts/SetCurrentRecruitmentIdAsDefValue.ts b/frontend/src/ts/account_applications/scripts/SetCurrentUserIdAsDefValue.ts similarity index 83% rename from frontend/src/ts/account_applications/scripts/SetCurrentRecruitmentIdAsDefValue.ts rename to frontend/src/ts/account_applications/scripts/SetCurrentUserIdAsDefValue.ts index f4e1c5f4..6ee27d35 100644 --- a/frontend/src/ts/account_applications/scripts/SetCurrentRecruitmentIdAsDefValue.ts +++ b/frontend/src/ts/account_applications/scripts/SetCurrentUserIdAsDefValue.ts @@ -2,7 +2,7 @@ import {AnalyticalScope, Behavior, TextField} from "@webbpm/base-package"; import {AuthorizationService} from "../../modules/app/service/authorization.service"; @AnalyticalScope("TextField") -export class SetCurrentRecruitmentIdAsDefValue extends Behavior { +export class SetCurrentUserIdAsDefValue extends Behavior { private textField: TextField; private authService: AuthorizationService; @@ -14,10 +14,9 @@ export class SetCurrentRecruitmentIdAsDefValue extends Behavior { start(): void { super.start(); - if (this.textField && this.textField.isPristine() && this.authService && this.authService.getCurrentSession()) { - this.textField.setValue(this.authService.getDomainId()); + this.textField.setValue(this.authService.getUserId()); this.getContext().getChangeDetector().detectChanges(); } } diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page index 71578af4..94ccc24f 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page @@ -1076,7 +1076,7 @@ string - "Ответственный за ЗИ СВК" + "Responsible_for_internal_control" @@ -1085,7 +1085,7 @@ behavior - {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -1120,7 +1120,7 @@ operation - "NOT_EQUALS" + "EQUALS" @@ -1617,10 +1617,10 @@ false - + - CheckUserRole - modules.user-management.component + ErvuCheckUserRole + account_applications true true @@ -1704,7 +1704,7 @@ string - "Ответственный за ЗИ" + "Responsible_for_information_security" @@ -1713,7 +1713,7 @@ behavior - {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -1893,7 +1893,7 @@ string - "Ответственный за ЗИ СВК" + "Responsible_for_internal_control" @@ -1902,7 +1902,7 @@ behavior - {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -2082,7 +2082,7 @@ string - "Администратор ПОИБ" + "security_administrator" @@ -2091,7 +2091,7 @@ behavior - {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -7362,7 +7362,7 @@ string - "Ответственный за ЗИ" + "Responsible_for_information_security" @@ -7371,7 +7371,7 @@ behavior - {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -7661,7 +7661,7 @@ string - "Ответственный за ЗИ СВК" + "Responsible_for_internal_control" @@ -7670,7 +7670,7 @@ behavior - {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -7856,7 +7856,7 @@ string - "Ответственный за ЗИ СВК" + "Responsible_for_internal_control" @@ -7865,7 +7865,7 @@ behavior - {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -8155,7 +8155,7 @@ string - "Администратор ПОИБ" + "security_administrator" @@ -8164,7 +8164,7 @@ behavior - {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -8471,7 +8471,7 @@ string - "Администратор ПОИБ" + "security_administrator" @@ -8480,7 +8480,7 @@ behavior - {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -8855,7 +8855,7 @@ string - "Ответственный за ЗИ" + "Responsible_for_information_security" @@ -8864,7 +8864,7 @@ behavior - {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -9408,7 +9408,7 @@ string - "Администратор ПОИБ" + "security_administrator" @@ -9417,7 +9417,7 @@ behavior - {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -10264,7 +10264,7 @@ string - "Администратор ПОИБ" + "security_administrator" @@ -10273,7 +10273,7 @@ behavior - {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"b6fd9891-5b67-4abd-99ad-6f71340c7326","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page index 82b97cda..290c130a 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page @@ -203,10 +203,10 @@ false - + - CheckUserRole - modules.user-management.component + ErvuCheckUserRole + account_applications true true @@ -290,7 +290,7 @@ string - "Ответственный за ЗИ" + "Responsible_for_information_security" @@ -299,7 +299,7 @@ behavior - {"objectId":"fd41e974-6a38-4c4f-8458-c4100249853b","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"fd41e974-6a38-4c4f-8458-c4100249853b","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -479,7 +479,7 @@ string - "Ответственный за ЗИ СВК" + "Responsible_for_internal_control" @@ -488,7 +488,7 @@ behavior - {"objectId":"fd41e974-6a38-4c4f-8458-c4100249853b","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"fd41e974-6a38-4c4f-8458-c4100249853b","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -668,7 +668,7 @@ string - "Администратор ПОИБ" + "security_administrator" @@ -677,7 +677,7 @@ behavior - {"objectId":"fd41e974-6a38-4c4f-8458-c4100249853b","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"fd41e974-6a38-4c4f-8458-c4100249853b","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на деактивацию.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на деактивацию.page index aa2f63b0..321bf920 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на деактивацию.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на деактивацию.page @@ -1514,6 +1514,7 @@ 6421e53c-2223-477f-bfb8-f6acaa4935b5 Hbox true + false false @@ -3932,6 +3933,7 @@ 0c7d30a2-2d41-4e88-a14a-bd3cc91705ee Validation controller_нет роли false + false false @@ -4048,7 +4050,6 @@ 2b018a80-bc55-4815-b87c-0c507c750f18 Vbox_current_user true - false false diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page index d5ba58b0..c985c280 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page @@ -108,7 +108,6 @@ c8cef3ed-af03-44f8-9fc0-491920366ab0 Vbox_15% true - false false @@ -204,10 +203,10 @@ false - + - CheckUserRole - modules.user-management.component + ErvuCheckUserRole + account_applications true true @@ -291,7 +290,7 @@ string - "Ответственный за ЗИ" + "Responsible_for_information_security" @@ -300,7 +299,7 @@ behavior - {"objectId":"fd41e974-6a38-4c4f-8458-c4100249853b","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"fd41e974-6a38-4c4f-8458-c4100249853b","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -480,7 +479,7 @@ string - "Ответственный за ЗИ СВК" + "Responsible_for_internal_control" @@ -489,7 +488,7 @@ behavior - {"objectId":"fd41e974-6a38-4c4f-8458-c4100249853b","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"fd41e974-6a38-4c4f-8458-c4100249853b","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -669,7 +668,7 @@ string - "Администратор ПОИБ" + "security_administrator" @@ -678,7 +677,7 @@ behavior - {"objectId":"fd41e974-6a38-4c4f-8458-c4100249853b","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"fd41e974-6a38-4c4f-8458-c4100249853b","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -3064,13 +3063,6 @@ - - f9a38417-9ad0-412a-9b5f-bbeb450dddd6 - ec1fa9b6-04e1-4b58-96c7-538963204d95 - Организация - false - true - b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 e24e70eb-d639-4be2-87a3-25927a07a229 @@ -6045,13 +6037,6 @@ - - fd7e47b9-dce1-4d14-9f3a-580c79f59579 - 6ab979cc-87b4-4c9f-9c4b-09546a1a0e57 - Button_отправить - false - true - 57c7cd21-1556-4dbd-b9da-33520486a1db 0e7761bc-f93b-41f8-b34a-316422b65c1f @@ -6202,7 +6187,6 @@ 13e4d06a-18b2-4b51-9cd5-1199ad8f50bd Dialog true - false false diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Список заявок.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Список заявок.page index 532fd50d..389300eb 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Список заявок.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Список заявок.page @@ -109,10 +109,10 @@ - + - CheckUserRole - modules.user-management.component + ErvuCheckUserRole + account_applications true true @@ -262,7 +262,7 @@ string - "Ответственный за ЗИ" + "Responsible_for_information_security" @@ -271,7 +271,7 @@ behavior - {"objectId":"891cc099-3ea0-45f4-b2a9-85550ae1136d","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"891cc099-3ea0-45f4-b2a9-85550ae1136d","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -487,7 +487,7 @@ string - "Ответственный за ЗИ СВК" + "Responsible_for_internal_control" @@ -496,7 +496,7 @@ behavior - {"objectId":"891cc099-3ea0-45f4-b2a9-85550ae1136d","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"891cc099-3ea0-45f4-b2a9-85550ae1136d","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -712,7 +712,7 @@ string - "Администратор ПОИБ" + "security_administrator" @@ -721,7 +721,7 @@ behavior - {"objectId":"891cc099-3ea0-45f4-b2a9-85550ae1136d","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} + {"objectId":"891cc099-3ea0-45f4-b2a9-85550ae1136d","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"} @@ -3716,7 +3716,7 @@ string - "Ответственный за ЗИ" + "Responsible_for_information_security" @@ -3725,7 +3725,7 @@ behavior -{"objectId":"891cc099-3ea0-45f4-b2a9-85550ae1136d","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"} +{"objectId":"891cc099-3ea0-45f4-b2a9-85550ae1136d","packageName":"account_applications","className":"ErvuCheckUserRole","type":"TS"}