From bdd3c5c6225b504edb0cbdff9aa0722bb40dde88 Mon Sep 17 00:00:00 2001 From: "adel.kalimullin" Date: Fri, 5 Sep 2025 11:53:05 +0300 Subject: [PATCH 1/4] =?UTF-8?q?SUPPORT-9377:=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=BF=D0=BE=D0=B4=20=D1=82?= =?UTF-8?q?=D1=80=D0=B8=D0=B3=D0=B5=D1=80=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82?= =?UTF-8?q?=D1=80=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=BE=D1=82=D0=BA=D1=80?= =?UTF-8?q?=D1=8B=D1=82=D0=B8=D0=B8=20=D0=B4=D0=B8=D0=B0=D0=BB=D0=BE=D0=B3?= =?UTF-8?q?=D0=B0=20mtm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Создание заявки на добавление пользователя.page | 71 +++++++++++++++---- 1 file changed, 59 insertions(+), 12 deletions(-) diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page index 563bf366..98e653d5 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page @@ -3715,12 +3715,6 @@ false - - liveFilter - - true - - skipInitialLoading @@ -3910,12 +3904,6 @@ false - - liveFilter - - true - - skipInitialLoading @@ -4553,6 +4541,35 @@ false + + elseActions + + + + + + behavior + + {"objectId":"42315d5a-5151-4165-8dd4-3595a1ddd26b","packageName":"component.container","className":"FilterGroup","type":"TS"} + + + + method + + "triggerFilter" + + + + value + + null + + + + + + + eventRefs @@ -4672,6 +4689,7 @@ + @@ -4687,6 +4705,35 @@ false + + elseActions + + + + + + behavior + + {"objectId":"e82eae52-f5b4-4684-96f3-a53c6c496e1c","packageName":"component.container","className":"FilterGroup","type":"TS"} + + + + method + + "triggerFilter" + + + + value + + null + + + + + + + eventRefs From 5cb159c6072f929e19b420fa544d5f8b78a5f066 Mon Sep 17 00:00:00 2001 From: "adel.kalimullin" Date: Fri, 5 Sep 2025 12:20:29 +0300 Subject: [PATCH 2/4] fix import --- frontend/src/ts/modules/app/service/authorization.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/ts/modules/app/service/authorization.service.ts b/frontend/src/ts/modules/app/service/authorization.service.ts index 110e8b65..0f9b428c 100644 --- a/frontend/src/ts/modules/app/service/authorization.service.ts +++ b/frontend/src/ts/modules/app/service/authorization.service.ts @@ -3,7 +3,7 @@ import {Subject} from "rxjs"; import {HttpClient} from "@angular/common/http"; import {WebsocketService} from "../websocket/websocket.service"; import {StatusUpdateService} from "./status-update.service"; -import {ErvuPermission} from "../enum/ErvuRole"; +import {ErvuPermission} from "../enum/ErvuPermission"; export interface UserSession { userId: string, From 5f2ad23377fd295625a18f5da0c1321fea6aca3b Mon Sep 17 00:00:00 2001 From: "adel.kalimullin" Date: Fri, 5 Sep 2025 12:24:45 +0300 Subject: [PATCH 3/4] SUPPORT-9377: fixes --- .../Создание заявки на добавление пользователя.page | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page index 98e653d5..e24b6300 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page @@ -4538,6 +4538,7 @@ 0e0c7763-7fa7-4a93-b011-34869b94116a AC - show roles dialog false + false false @@ -4579,13 +4580,13 @@ behavior - {"objectId":"afd1b330-c73a-4455-bbca-e7cb1f00f142","packageName":"component","className":"Dialog","type":"TS"} + {"objectId":"ba4d3cff-535f-42d1-9cfc-26022277ee64","packageName":"component.button","className":"Button","type":"TS"} propertyName - "showDialogEvent" + "successActionEvent" @@ -4743,13 +4744,13 @@ behavior - {"objectId":"41af5802-f637-4326-a05b-ba40a6f36899","packageName":"component","className":"Dialog","type":"TS"} + {"objectId":"702268ef-1cd6-4969-8937-a64f5a05447d","packageName":"component.button","className":"Button","type":"TS"} propertyName - "showDialogEvent" + "successActionEvent" @@ -5071,6 +5072,7 @@ a20bed37-7b67-4df8-95f7-e0a84815b741 Hbox true + false false From 121f2d85844a438f4a0be626d3354d03a227d748 Mon Sep 17 00:00:00 2001 From: "adel.kalimullin" Date: Fri, 5 Sep 2025 12:49:44 +0300 Subject: [PATCH 4/4] SUPPORT-9377: fixes 2 --- .../Создание заявки на добавление пользователя.page | 57 +++++++++++++++++-- 1 file changed, 53 insertions(+), 4 deletions(-) diff --git a/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page b/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page index e24b6300..3bae507f 100644 --- a/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page +++ b/resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page @@ -4545,6 +4545,30 @@ elseActions + + + + + behavior + + {"objectId":"0f8d75a8-4816-4664-8e6d-83b48f79472f","packageName":"component","className":"Grid","type":"TS"} + + + + method + + "clear" + + + + value + + null + + + + + @@ -4580,13 +4604,13 @@ behavior - {"objectId":"ba4d3cff-535f-42d1-9cfc-26022277ee64","packageName":"component.button","className":"Button","type":"TS"} + {"objectId":"afd1b330-c73a-4455-bbca-e7cb1f00f142","packageName":"component","className":"Dialog","type":"TS"} propertyName - "successActionEvent" + "showDialogEvent" @@ -4703,12 +4727,37 @@ 94d1476e-f124-40e9-aa20-8a34e0f95b25 AC - show ips dialog false + false false elseActions + + + + + behavior + + {"objectId":"8cc50f6d-7910-44ed-9c0d-968d9d7a424e","packageName":"component","className":"Grid","type":"TS"} + + + + method + + "clear" + + + + value + + null + + + + + @@ -4744,13 +4793,13 @@ behavior - {"objectId":"702268ef-1cd6-4969-8937-a64f5a05447d","packageName":"component.button","className":"Button","type":"TS"} + {"objectId":"41af5802-f637-4326-a05b-ba40a6f36899","packageName":"component","className":"Dialog","type":"TS"} propertyName - "successActionEvent" + "showDialogEvent"