From 9625d5d11a4ddc9184a2c8626d9f49e85fcbe3f4 Mon Sep 17 00:00:00 2001 From: kochetkov Date: Wed, 17 Jul 2024 10:35:41 +0300 Subject: [PATCH 01/24] SUPPORT-8426 disable webbpm security --- backend/pom.xml | 28 - backend/src/main/java/AppConfig.java | 4 +- .../ru/micord/security/SecurityConfig.java | 25 + .../webbpm/user-management-routing.module.ts | 88 --- .../src/ts/modules/webbpm/webbpm.module.ts | 3 - pom.xml | 30 + .../Процессы/process-instance-list.page | 199 ------- .../Процессы/process-instance.page | 179 ------ .../Группы редактирование.page | 278 --------- .../Группы создание.page | 278 --------- .../Управление пользователями/Группы.page | 193 ------ .../Организации.page | 168 ------ .../Организация редактирование(создание).page | 153 ----- .../Пользователи редактирование.page | 522 ---------------- .../Пользователи создание.page | 424 ------------- .../Пользователи.page | 555 ------------------ .../Роли редактирование (создание).page | 152 ----- .../Управление пользователями/Роли.page | 192 ------ .../Функции безопасности.page | 276 --------- 19 files changed, 58 insertions(+), 3689 deletions(-) create mode 100644 backend/src/main/java/ru/micord/security/SecurityConfig.java delete mode 100644 frontend/src/ts/modules/webbpm/user-management-routing.module.ts delete mode 100644 resources/src/main/resources/business-model/Процессы/process-instance-list.page delete mode 100644 resources/src/main/resources/business-model/Процессы/process-instance.page delete mode 100644 resources/src/main/resources/business-model/Управление пользователями/Группы редактирование.page delete mode 100644 resources/src/main/resources/business-model/Управление пользователями/Группы создание.page delete mode 100644 resources/src/main/resources/business-model/Управление пользователями/Группы.page delete mode 100644 resources/src/main/resources/business-model/Управление пользователями/Организации.page delete mode 100644 resources/src/main/resources/business-model/Управление пользователями/Организация редактирование(создание).page delete mode 100644 resources/src/main/resources/business-model/Управление пользователями/Пользователи редактирование.page delete mode 100644 resources/src/main/resources/business-model/Управление пользователями/Пользователи создание.page delete mode 100644 resources/src/main/resources/business-model/Управление пользователями/Пользователи.page delete mode 100644 resources/src/main/resources/business-model/Управление пользователями/Роли редактирование (создание).page delete mode 100644 resources/src/main/resources/business-model/Управление пользователями/Роли.page delete mode 100644 resources/src/main/resources/business-model/Управление пользователями/Функции безопасности.page diff --git a/backend/pom.xml b/backend/pom.xml index fbdc3e6..e1d6965 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -184,18 +184,6 @@ ru.cg.webbpm.modules.webkit active-users-tracker - - ru.cg.webbpm.modules.security - security-beans - - - ru.cg.webbpm.modules.security - security-api - - - ru.cg.webbpm.modules.security - security-esia - ru.cg.webbpm.modules.reporting reporting-api @@ -232,14 +220,6 @@ ru.cg.webbpm.modules webkit-base - - ru.cg.webbpm.modules.security - security-db-synchronization-api - - - ru.cg.webbpm.modules.security - security-db-synchronization-ldap-impl - xerces xercesImpl @@ -256,14 +236,6 @@ org.apache.tika tika-core - - org.springframework.security.kerberos - spring-security-kerberos-core - - - org.springframework.security.kerberos - spring-security-kerberos-web - org.bouncycastle bcprov-jdk15on diff --git a/backend/src/main/java/AppConfig.java b/backend/src/main/java/AppConfig.java index f7645b2..ccd3330 100644 --- a/backend/src/main/java/AppConfig.java +++ b/backend/src/main/java/AppConfig.java @@ -11,6 +11,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.EnableAspectJAutoProxy; +import org.springframework.context.annotation.FilterType; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; @@ -30,11 +31,12 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; "i18n", "errorhandling", "database", - "security", "component.addresses", "gen", "ru.cg", "ru.micord" +}, excludeFilters = { + @ComponentScan.Filter(type = FilterType.REGEX, pattern = "security.WebSecurityConfig") }) @EnableAspectJAutoProxy(proxyTargetClass = true) @EnableWebMvc diff --git a/backend/src/main/java/ru/micord/security/SecurityConfig.java b/backend/src/main/java/ru/micord/security/SecurityConfig.java new file mode 100644 index 0000000..3036dc7 --- /dev/null +++ b/backend/src/main/java/ru/micord/security/SecurityConfig.java @@ -0,0 +1,25 @@ +package ru.micord.security; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.Customizer; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.web.SecurityFilterChain; + +@Configuration +@EnableWebSecurity +//@EnableAuthorizationServer +public class SecurityConfig { + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + + http.csrf().disable() + .authorizeHttpRequests() + .antMatchers("/**") + .permitAll(); + + return http.build(); + } +} diff --git a/frontend/src/ts/modules/webbpm/user-management-routing.module.ts b/frontend/src/ts/modules/webbpm/user-management-routing.module.ts deleted file mode 100644 index 140ba29..0000000 --- a/frontend/src/ts/modules/webbpm/user-management-routing.module.ts +++ /dev/null @@ -1,88 +0,0 @@ -import {RouterModule, Routes} from "@angular/router"; -import {NgModule} from "@angular/core"; -import { - AuthenticationGuard, - ConfirmExitGuard -} from "@webbpm/base-package"; - -const routes: Routes = [ - { - path: 'user-management', - canActivate: [AuthenticationGuard], - children: [ - { - path: 'users', - loadChildren: 'generated-sources/page-user-management-users.module#PageusermanagementusersModule', - canActivate: [ConfirmExitGuard] - }, - { - path: 'users/new', - loadChildren: 'generated-sources/page-user-management-user-create.module#PageusermanagementusercreateModule', - canActivate: [ConfirmExitGuard] - }, - { - path: 'users/:id', - loadChildren: 'generated-sources/page-user-management-user-edit.module#PageusermanagementusereditModule', - canActivate: [ConfirmExitGuard] - }, - { - path: 'org-units', - loadChildren: 'generated-sources/page-user-management-org-units.module#PageusermanagementorgunitsModule', - canActivate: [ConfirmExitGuard] - }, - { - path: 'org-units/new', - loadChildren: 'generated-sources/page-user-management-org-unit.module#PageusermanagementorgunitModule', - canActivate: [ConfirmExitGuard] - }, - { - path: 'org-units/:id', - loadChildren: 'generated-sources/page-user-management-org-unit.module#PageusermanagementorgunitModule', - canActivate: [ConfirmExitGuard] - }, - { - path: 'roles', - loadChildren: 'generated-sources/page-user-management-roles.module#PageusermanagementrolesModule', - canActivate: [ConfirmExitGuard] - }, - { - path: 'roles/new', - loadChildren: 'generated-sources/page-user-management-role.module#PageusermanagementroleModule', - canActivate: [ConfirmExitGuard] - }, - { - path: 'roles/:id', - loadChildren: 'generated-sources/page-user-management-role.module#PageusermanagementroleModule', - canActivate: [ConfirmExitGuard] - }, - { - path: 'groups', - loadChildren: 'generated-sources/page-user-management-groups.module#PageusermanagementgroupsModule', - canActivate: [ConfirmExitGuard] - }, - { - path: 'groups/new', - loadChildren: 'generated-sources/page-user-management-group-create.module#PageusermanagementgroupcreateModule', - canActivate: [ConfirmExitGuard] - }, - { - path: 'groups/:id', - loadChildren: 'generated-sources/page-user-management-group-edit.module#PageusermanagementgroupeditModule', - canActivate: [ConfirmExitGuard] - }, - { - path: 'authorities', - loadChildren: 'generated-sources/page-user-management-authorities.module#PageusermanagementauthoritiesModule', - canActivate: [ConfirmExitGuard] - } - ] - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class UserManagementRoutingModule { - -} diff --git a/frontend/src/ts/modules/webbpm/webbpm.module.ts b/frontend/src/ts/modules/webbpm/webbpm.module.ts index 427c848..4afa6a5 100644 --- a/frontend/src/ts/modules/webbpm/webbpm.module.ts +++ b/frontend/src/ts/modules/webbpm/webbpm.module.ts @@ -19,7 +19,6 @@ import {TaskParamsProvider} from "@webbpm/base-package"; import {ProcessInstanceParamsProvider} from "@webbpm/base-package"; import {AppRoutingModule} from "../app/app-routing.module"; import {AppJivoChatWidgetService} from "../app/service/app-jivo-chat.service"; -import {UserManagementRoutingModule} from "./user-management-routing.module"; import {GlobalErrorHandler} from "./handler/global-error.handler.prod"; import {DEFAULT_HTTP_INTERCEPTOR_PROVIDERS} from "./interceptor/default-interceptors.prod"; @@ -31,11 +30,9 @@ let IMPORTS = [ ToastNoAnimationModule.forRoot(), AgGridModule, AppRoutingModule, - UserManagementRoutingModule, BpmnModule, CoreModule, ComponentsModule, - SecurityModule, AppModule, WebbpmRoutingModule ]; diff --git a/pom.xml b/pom.xml index 1e33147..b03cd09 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,36 @@ ru.cg.webbpm.packages.base backend 3.174.1 + + + ru.cg.webbpm.modules.security + security-beans + + + ru.cg.webbpm.modules.security + security-api + + + ru.cg.webbpm.modules.security + security-esia + + + ru.cg.webbpm.modules.security + security-db-synchronization-api + + + ru.cg.webbpm.modules.security + security-db-synchronization-ldap-impl + + + org.springframework.security.kerberos + spring-security-kerberos-core + + + org.springframework.security.kerberos + spring-security-kerberos-web + + ervu_lkrp_fl.ervu_lkrp_fl diff --git a/resources/src/main/resources/business-model/Процессы/process-instance-list.page b/resources/src/main/resources/business-model/Процессы/process-instance-list.page deleted file mode 100644 index f8e7b60..0000000 --- a/resources/src/main/resources/business-model/Процессы/process-instance-list.page +++ /dev/null @@ -1,199 +0,0 @@ - - - process-instance-list - - 3.172.3 - - - ru.cg.webbpm.packages.base.resources - 3.172.4 - - - - - fe225a1a-1c03-485e-a069-18b92ab4f7f7 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - ProcessInstanceList - true - false - - - - - - - e24cd1b9-23e0-48dc-b0bf-60d2d1658494 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Текст - false - false - - - - - - - - b42176d1-e538-45fb-aeb6-f51390228082 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Группа фильтров - true - false - - - - filterableComp - - null - - - - - - - - filterable - - {"objectId":"3b06ffb8-18ef-4e69-8475-a105542a1737","packageName":"rpc","className":"GridRpcService","type":"JAVA"} - - - - - - - - - - cc38963d-5d25-44f9-b3ff-6a308c811ce9 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Текст - false - false - - - - - - - - 435a96a3-17b3-4f07-a5bf-f3b6270fc45b - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Статичный переключатель - false - false - - - - - - - - - - - dd251ec9-8b42-4d52-b203-6e5bc158b235 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Горизонтальный контейнер - true - false - - - - - - - 9de40b60-d339-4899-baeb-ab41db339380 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Фильтр по дате (с) - false - false - - - - - - - - - 0880e07c-1abf-428a-99ba-eedfb725b71e - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Фильтр по дате (по) - false - false - - - - - - - - - bdb3cecd-7a0b-4027-b9c5-591119171cf7 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Фильтр по наименованию - false - false - - - - - - - - - - - 5f560694-8ded-4d0c-b75c-b4c41c58d48c - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Вертикальный контейнер - true - false - - - - - - - 6443c41a-8c07-4ef7-98cf-0c2d76884dfd - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Горизонтальный контейнер - true - false - - - - - - - 61db7e91-9ace-418a-8a0d-d81877411d62 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Кнопка выбора - false - false - - - - 6c8d958f-4e3a-4606-be55-4ff9a6640cc7 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Кнопка выбора - false - false - - - - - - 3b06ffb8-18ef-4e69-8475-a105542a1737 - fe64cb47-c790-479c-92a3-d8cdaf101cdc - Таблица - false - false - - - - - - - - - diff --git a/resources/src/main/resources/business-model/Процессы/process-instance.page b/resources/src/main/resources/business-model/Процессы/process-instance.page deleted file mode 100644 index b8fab0f..0000000 --- a/resources/src/main/resources/business-model/Процессы/process-instance.page +++ /dev/null @@ -1,179 +0,0 @@ - - - process-instance - - 3.172.3 - - - ru.cg.webbpm.packages.base.resources - 3.172.4 - - - - - 2bb8a14d-6a69-43c5-9c0e-c301f982d26f - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - ProcessInstance - true - false - - - - - - - 3800a37f-56d0-4c92-9597-ec0a4c2e4e13 - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - Text - false - false - - - - - - - - - - fd2c1c62-f6f2-4460-b93a-bf737a0dfcb1 - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - TabContainer - true - false - - - - - - - d6f9a5b1-6456-4961-a243-18e8a5b53fbf - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - TabItem - true - false - - - - - - - de8f0d04-844d-43c6-97be-afc06678d452 - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - HBox - true - false - - - - - - - 415990b0-79a9-40c2-99c9-0fe30b3f8680 - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - SelectButton - false - false - - - - 4f869d1a-4678-4869-a82d-6397d0f566dd - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - SelectButton - false - false - - - - - 8f7e43aa-831f-4b3e-a942-9b3edaa98ebc - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - Grid - false - false - - - - - - - - 41638fc1-45eb-4edb-b0a1-904869e3996a - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - TabItem - true - false - - - - - - - a5062a8d-c311-4250-a632-b87c766ef797 - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - Флаг - false - false - - - - - - - - 79275d69-0eac-4e16-842b-0cc4b8a8f455 - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - TextArea - false - false - - - - - - - - - b0f923b7-60c1-4246-b7ee-d244f65fe233 - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - Обработка событий - false - false - - true - - - - - - 6b11ca6b-f757-481b-b4a6-46d1528464ca - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - TabItem - true - false - - - - - - - 37ac294e-b21f-4ec9-8fc2-ff9d137baf5b - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - ProcessInstanceDiagram - false - false - - - - - - - 9c9c7512-4ec6-459d-b173-cda11ca789c4 - 7bfaeeee-fdd8-49ee-9bb0-e9bface7cb2b - Button - false - false - - - - diff --git a/resources/src/main/resources/business-model/Управление пользователями/Группы редактирование.page b/resources/src/main/resources/business-model/Управление пользователями/Группы редактирование.page deleted file mode 100644 index cb69a63..0000000 --- a/resources/src/main/resources/business-model/Управление пользователями/Группы редактирование.page +++ /dev/null @@ -1,278 +0,0 @@ - - - user-management-group-edit - - 3.172.3 - - - ru.cg.webbpm.packages.base.resources - 3.172.4 - - - - - ed47cfae-64da-4360-8f61-1087179ad78b - 1011fa6a-8730-41f1-836a-928dc32f1786 - GroupsEdit - true - false - - - - - - - a18909dd-64ee-433f-82b3-70e1917f1b8d - 1011fa6a-8730-41f1-836a-928dc32f1786 - Text - false - false - - - - - - - - e2c223a4-377d-49e3-904f-375ca30a08d5 - 1011fa6a-8730-41f1-836a-928dc32f1786 - Form - true - false - - - - - - - - c629e7bd-878a-4411-9e29-bb44f4c11ba7 - 1011fa6a-8730-41f1-836a-928dc32f1786 - Горизонтальный контейнер - true - false - - - - - - - 075ead72-0b6f-411f-88b4-69f5ab4a4052 - 1011fa6a-8730-41f1-836a-928dc32f1786 - Вертикальный контейнер - true - false - - - - - - - 389e2f20-104b-4136-aba0-3a0ccd45f96e - 1011fa6a-8730-41f1-836a-928dc32f1786 - Текст - false - false - - - - - - - - d2a08a08-2807-4471-a2b5-f7a78fd1bb0d - 1011fa6a-8730-41f1-836a-928dc32f1786 - name - false - false - - - - - - - - - 76cc68cf-575a-46a0-8ca2-31109c3963c4 - 1011fa6a-8730-41f1-836a-928dc32f1786 - created - false - false - - - - - - - - - 0a47e758-c21e-4f8a-92bf-150c872b58ed - 1011fa6a-8730-41f1-836a-928dc32f1786 - updated - false - false - - - - - - - - ae991562-f703-4403-8d49-a0e5e540bc6c - 1011fa6a-8730-41f1-836a-928dc32f1786 - access_level - false - false - - - - - - - - - - 41774d7b-90c5-4bc0-a563-509d036206e3 - 1011fa6a-8730-41f1-836a-928dc32f1786 - Вертикальный контейнер - true - false - - - - - - - 4eb50f01-cccc-4f3a-b66d-4d57dde0a212 - 1011fa6a-8730-41f1-836a-928dc32f1786 - Text - false - false - - - - - - - - 704d07af-1823-48d6-acad-83771428be38 - 1011fa6a-8730-41f1-836a-928dc32f1786 - HBox - true - false - - - - - - - 528504db-2727-4750-92a9-5f09dacc781d - 1011fa6a-8730-41f1-836a-928dc32f1786 - AvailableRecordsGrid - false - false - - - - - - - - - - e791675f-a1d1-402b-afe1-556b434b1248 - 1011fa6a-8730-41f1-836a-928dc32f1786 - Buttons - true - false - - - - - - -6731261c-f859-489e-9ca9-08b33aa77b58 -1011fa6a-8730-41f1-836a-928dc32f1786 -Add -false -false - - - - -639fa2da-bdb2-4d26-97db-4a2bef4cfb81 -1011fa6a-8730-41f1-836a-928dc32f1786 -AddAll -false -false - - - - -291de4f8-51a4-4331-b26c-5994e9de5697 -1011fa6a-8730-41f1-836a-928dc32f1786 -Remove -false -false - - - - -366c5745-c04f-4d11-a652-54abe1a5d4ca -1011fa6a-8730-41f1-836a-928dc32f1786 -RemoveAll -false -false - - - - - - 76735e43-2b8f-440a-abd1-80c556326763 - 1011fa6a-8730-41f1-836a-928dc32f1786 - LinkFieldDialog - false - false - - - - - - - - - - - - - - - fb5e15d6-c838-4fa7-b20d-714a2abd03a6 - 1011fa6a-8730-41f1-836a-928dc32f1786 - HBox - true - false - - - - - - - 3a2c64e6-edcf-4058-9a02-897b6dc9704e - 1011fa6a-8730-41f1-836a-928dc32f1786 - save-button - false - false - - - - 29e058b0-bc2a-45bb-8422-2922881db1be - 1011fa6a-8730-41f1-836a-928dc32f1786 - exit-button - false - false - - - - - diff --git a/resources/src/main/resources/business-model/Управление пользователями/Группы создание.page b/resources/src/main/resources/business-model/Управление пользователями/Группы создание.page deleted file mode 100644 index ae4284e..0000000 --- a/resources/src/main/resources/business-model/Управление пользователями/Группы создание.page +++ /dev/null @@ -1,278 +0,0 @@ - - - user-management-group-create - - 3.172.3 - - - ru.cg.webbpm.packages.base.resources - 3.172.4 - - - - - ca7390f1-1891-4161-b8ae-ef66de5776b7 - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - GroupsCreate - true - false - - - - - - - fa5b05d3-871d-4be9-b8f5-8912dfb35d45 - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - Text - false - false - - - - - - - - bcb8e5ad-b8e7-44b0-a145-13de809dbf33 - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - Form - true - false - - - - - - - - ff9f35ed-bf7f-42c0-8479-068abaa39911 - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - Горизонтальный контейнер - true - false - - - - - - - 624bdc70-52da-4c81-8033-316b3309260e - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - Вертикальный контейнер - true - false - - - - - - - 4cde8573-92ae-4c4c-9428-d7d852e78c62 - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - Текст - false - false - - - - - - - - 485b6e35-2b31-4d0e-8ce8-fe03980ea0d8 - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - name - false - false - - - - - - - - - 0233b718-9edb-4650-863d-298d21d16aee - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - created - false - false - - - - - - - - - 5b38db22-58c4-4d64-b5ee-b252e7b0bd66 - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - updated - false - false - - - - - - - - 1aa93ca2-3ba3-4ac8-bcae-4307ceb4d3cf - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - access_level - false - false - - - - - - - - - - 8e395fd7-a9b5-4eae-8c95-72e594ee3357 - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - Вертикальный контейнер - true - false - - - - - - - 91956fb3-8832-4572-9823-df2e83ab8922 - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - Text - false - false - - - - - - - - 7d4e83a4-45d2-45a5-a778-40d0c0f4aa3a - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - HBox - true - false - - - - - - - ed5afd59-d3c6-42b1-8744-687909c3f2dc - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - AvailableRecordsGrid - false - false - - - - - - - - - - 2272444f-bb2b-4c87-a54e-7c44a5cdc67a - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - Buttons - true - false - - - - - - -b33d3f9b-74a1-4c30-a5a6-da14bf2b8c7d -deab5d8f-591d-41b4-8485-1c5d3ef48a16 -Add -false -false - - - - -bc429b81-de76-48e1-834f-7757ab4c97a1 -deab5d8f-591d-41b4-8485-1c5d3ef48a16 -AddAll -false -false - - - - -84165e8b-829a-4656-a2e9-4ca87cfd217e -deab5d8f-591d-41b4-8485-1c5d3ef48a16 -Remove -false -false - - - - -49906463-bdeb-424c-aa70-afec7bc4da20 -deab5d8f-591d-41b4-8485-1c5d3ef48a16 -RemoveAll -false -false - - - - - - ed375b71-5f95-43af-ae69-5a5eacb3f479 - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - LinkFieldDialog - false - false - - - - - - - - - - - - - - - a65dbf74-aa81-4b28-b008-2df11395b9f8 - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - HBox - true - false - - - - - - - b9463b17-97c1-4c49-9fc7-e4ee9bb621dd - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - save-button - false - false - - - - 0b170e2b-a865-4aca-a9da-c7da77d9b0fd - deab5d8f-591d-41b4-8485-1c5d3ef48a16 - exit-button - false - false - - - - - diff --git a/resources/src/main/resources/business-model/Управление пользователями/Группы.page b/resources/src/main/resources/business-model/Управление пользователями/Группы.page deleted file mode 100644 index 1ea298b..0000000 --- a/resources/src/main/resources/business-model/Управление пользователями/Группы.page +++ /dev/null @@ -1,193 +0,0 @@ - - - user-management-groups - - 3.172.3 - - - ru.cg.webbpm.packages.base.resources - 3.172.4 - - - - - 0f8d0a8b-8014-4367-8ff3-7f049c284978 - edc984f0-039d-4fa6-93d2-df03bf6dc08c - Groups - true - false - - - - - - - 7a7ae21a-2c01-49ee-a2d4-22f933d9445c - edc984f0-039d-4fa6-93d2-df03bf6dc08c - Text - false - false - - - - - - - - 9055eba3-0243-4746-9890-70b486c3fb8d - edc984f0-039d-4fa6-93d2-df03bf6dc08c - FilterGroup - true - false - - - - filterableComp - - null - - - - - - - - filterable - - {"objectId":"1ddc006e-75b2-4103-87e1-7991c9f3520d","packageName":"rpc","className":"GridRpcService","type":"JAVA"} - - - - - - - - - - 9c81110c-d0d5-4d2a-afa8-e5b093ad47ba - edc984f0-039d-4fa6-93d2-df03bf6dc08c - search - false - false - - - - - - - - - - - 1ddc006e-75b2-4103-87e1-7991c9f3520d - edc984f0-039d-4fa6-93d2-df03bf6dc08c - Grid - false - false - - - - - - - 3ae192dd-d45b-4c23-bd8d-b386abda0273 - edc984f0-039d-4fa6-93d2-df03bf6dc08c - HBox - true - false - - - - - - - 18b01c4c-1c1d-4436-870d-7541a72648b6 - edc984f0-039d-4fa6-93d2-df03bf6dc08c - create-button - false - false - - - - - 5c8de2f4-6849-48bc-b8dd-36e649ad2540 - edc984f0-039d-4fa6-93d2-df03bf6dc08c - edit-button - false - false - - - - - 4a9e9ed8-9936-428d-8ddd-4502e2a55700 - edc984f0-039d-4fa6-93d2-df03bf6dc08c - delete-button - false - false - - - - - - 26d4430f-ddf1-4997-83c5-0009edf32719 - edc984f0-039d-4fa6-93d2-df03bf6dc08c - ac-create - false - false - false - - true - - - - - 15964601-92db-4da1-a279-5664844a0bf5 - edc984f0-039d-4fa6-93d2-df03bf6dc08c - ac-edit - false - false - false - - true - - - - - c4317a56-f9f6-4ea1-90bc-776c3bfaa8c0 - edc984f0-039d-4fa6-93d2-df03bf6dc08c - ac-delete - false - false - false - - true - - - - - - 6c034de2-0633-4f45-9ba1-625a00421718 - edc984f0-039d-4fa6-93d2-df03bf6dc08c - Roles - false - false - - - - - - - - 3acecb3c-c1d3-4a1e-9873-1c6050ff74f0 - edc984f0-039d-4fa6-93d2-df03bf6dc08c - RolesGrid - false - false - false - - - - - - - diff --git a/resources/src/main/resources/business-model/Управление пользователями/Организации.page b/resources/src/main/resources/business-model/Управление пользователями/Организации.page deleted file mode 100644 index a520c2f..0000000 --- a/resources/src/main/resources/business-model/Управление пользователями/Организации.page +++ /dev/null @@ -1,168 +0,0 @@ - - - user-management-org-units - - 3.172.3 - - - ru.cg.webbpm.packages.base.resources - 3.172.4 - - - - - 5cc0e63d-f697-47a8-a9dc-3170f1a99721 - 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 - Organizations - true - false - - - - - - - c262a5da-38cb-4739-9d59-3bb7fdf55e26 - 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 - Текст - false - false - - - - - - - - 2c143f13-f25f-49e2-8615-aa76a1dac394 - 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 - Группа фильтров - true - false - - - - filterableComp - - null - - - - - - - - filterable - - {"objectId":"2db7e240-3978-4826-aa2d-4d031cb0e7a0","packageName":"rpc","className":"TreeGridRpcService","type":"JAVA"} - - - - - - - - - - d64cc9e2-4e33-4a5d-9792-d4ac8f5a5754 - 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 - Фильтр по текстовому полю - false - false - - - - - - - - - - - 2db7e240-3978-4826-aa2d-4d031cb0e7a0 - 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 - Древовидная таблица - false - false - - - - - - e3ca31f5-4ec1-45a9-b195-94806048ba3f - 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 - Горизонтальный контейнер - true - false - - - - - - - 480a06a2-f4b1-46eb-bf3f-0e4097460719 - 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 - create-button - false - false - - - - - 653b6b0c-072c-40d1-bcc0-41157a888fad - 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 - edit-button - false - false - - - - - e61b659b-d293-4005-a1c2-0d110d058c52 - 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 - delete-button - false - false - - - - - - a01d154c-55fe-4a77-97b0-e2e90ce5e370 - 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 - ac-create - false - false - false - - true - - - - - 8ec15acd-7973-4f09-8723-3c69ec829f78 - 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 - ac-edit - false - false - false - - true - - - - - 885a70ad-e6fd-4a17-a9ac-66c326c117fe - 73bf62ed-7cbe-4b46-be5e-5669e5e3f2f3 - ac-delete - false - false - false - - true - - - - - - diff --git a/resources/src/main/resources/business-model/Управление пользователями/Организация редактирование(создание).page b/resources/src/main/resources/business-model/Управление пользователями/Организация редактирование(создание).page deleted file mode 100644 index 61938e9..0000000 --- a/resources/src/main/resources/business-model/Управление пользователями/Организация редактирование(создание).page +++ /dev/null @@ -1,153 +0,0 @@ - - - user-management-org-unit - - 3.172.3 - - - ru.cg.webbpm.packages.base.resources - 3.172.4 - - - - - 63022aff-e117-4b58-88ac-8e230b0e9b22 - 0e7f6825-534f-4eba-9ec6-c43cbad07636 - OrganizationEdit - true - false - - - - - - - 2b44d4d9-20e0-49be-8a98-993fd14f7be5 - 0e7f6825-534f-4eba-9ec6-c43cbad07636 - Текст - false - false - - - - - - - - ff113441-2a31-440c-9c81-a987176bff61 - 0e7f6825-534f-4eba-9ec6-c43cbad07636 - Форма - true - false - - - - - - - - bd8deb9b-95ce-4849-b214-19cb36d94830 - 0e7f6825-534f-4eba-9ec6-c43cbad07636 - Горизонтальный контейнер - true - false - - - - - - - b994094c-96bb-476f-8f92-f5fa3c2961bd - 0e7f6825-534f-4eba-9ec6-c43cbad07636 - Вертикальный контейнер - true - false - - - - - - - 51b5145b-92ca-42be-9aa4-9402abe670c7 - 0e7f6825-534f-4eba-9ec6-c43cbad07636 - Выпадающий список (с возможностью сохранения) - false - false - - - - - - - - - 64e9908e-1afc-4ae1-adb3-512576ea8ff4 - 0e7f6825-534f-4eba-9ec6-c43cbad07636 - Текстовое поле (с возможностью сохранения) - false - false - - - - - - - - - f8640cfc-d68c-4596-80a5-0ecb2c6ce5a4 - 0e7f6825-534f-4eba-9ec6-c43cbad07636 - Текстовое поле (с возможностью сохранения) - false - false - - - - - - - - - - 10165a7a-48db-42dc-882e-afcfad67717a - 0e7f6825-534f-4eba-9ec6-c43cbad07636 - Вертикальный контейнер - true - false - - - - - - - - - - 1bb8d3bb-5e09-49ba-8169-488e55f2285a - 0e7f6825-534f-4eba-9ec6-c43cbad07636 - Горизонтальный контейнер - true - false - - - - - - - e426c18f-190b-4dac-be54-dad7a39d2000 - 0e7f6825-534f-4eba-9ec6-c43cbad07636 - save-button - false - false - - - - 7ca91a23-0453-4875-9288-312d051defcd - 0e7f6825-534f-4eba-9ec6-c43cbad07636 - exit-button - false - false - - - - - diff --git a/resources/src/main/resources/business-model/Управление пользователями/Пользователи редактирование.page b/resources/src/main/resources/business-model/Управление пользователями/Пользователи редактирование.page deleted file mode 100644 index ef12371..0000000 --- a/resources/src/main/resources/business-model/Управление пользователями/Пользователи редактирование.page +++ /dev/null @@ -1,522 +0,0 @@ - - - user-management-user-edit - - 3.172.3 - - - ru.cg.webbpm.packages.base.resources - 3.172.4 - - - - - c4b48815-f449-48fe-9ae0-dec9b6f4c53c - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - UsersEdit - true - false - - - - - - - 10b97eb7-30d3-4af1-877c-7870d5178172 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - Text - false - false - - - - - - - - 9d2fca5f-4354-46fc-a743-2644fbb9699d - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - Form - true - false - - - - - - - - - b538ab89-381a-4c01-b8f6-77cb61a2b3f6 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - HBox - true - false - - - - - - - 2f2b7ec7-dfd8-4789-b27b-5d72f509314c - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - VBox - true - false - - - - - - - 2837d2f5-2a60-400e-ab3f-68556cce3981 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - Text - false - false - - - - - - - - 51ad723f-1b70-49ca-96be-137e51e907bb - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - HBox - true - false - - - - - - - 2adc0c45-dd66-4398-b21b-27a008756228 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - VBox - true - false - - - - - - - - 80de32f7-e75d-44c4-9c5a-8fa9e9563ebf - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - VBox - true - false - - - - - - - - - c4ce09bf-b91d-4025-8715-e76925202713 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - last-name - false - false - - - - - - - - - bc4815fd-2f8d-4545-b6f8-7a651beef2f6 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - first-name - false - false - - - - - - - - - 778d3b64-d52f-48ff-b854-7df244f20d55 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - middleName - false - false - - - - - - - - - 7c66e464-2e75-4774-93ae-fbd88633fab7 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - phone - false - false - - - - - - - - - a014b3b3-1cd2-46cd-b317-74fa0dbf5733 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - created - false - false - - - - - - - - - 627b604f-8102-4df7-932a-ac88b410ed1b - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - updated - false - false - - - - - - - - - b5373d18-ea29-428e-be37-62016f619693 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - VBox - true - false - - - - - - - 0507914c-bc97-4e76-8ef5-4617c868b50a - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - Text - false - false - - - - - - - - 749b6444-6ba3-4ca5-a6f7-eaef9641e644 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - HBox - true - false - - - - - - - 00688380-2458-43bc-96ca-6b3b775bcce0 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - VBox - true - false - - - - - - - - ed515db1-d2d0-495e-ab83-4a66431b311d - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - VBox - true - false - - - - - - - - - 77dc7647-69d5-4f7c-9f75-14eaa4609671 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - login - false - false - - - - - - - - - bbb1fc4f-922e-46e4-8ceb-b911af24a32f - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - password - false - false - - - - - - - - - - 84ef055e-dd0d-446e-87d4-9c25a3fc86e0 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - password-repeat - false - false - - - - - - - - 04c23030-0c55-414a-9228-77ce8046deac - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - email - false - false - - - - - - - - - 5486199d-c932-413c-8ab6-e674633898af - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - blocked - false - false - - - - - - - - 3c84ea2f-68bb-4cba-a32a-da97a043e84c - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - password-changed - false - false - - - - - - - - 7cde5b9a-404d-4654-ae17-f0c753c64518 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - password-expires - false - false - - - - - - - - ad491899-f407-4067-a0fe-d59e528b7470 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - org_unit_id - false - false - - - - - - - - - - a9e6fbb2-4bb7-40af-966a-b22e6074e31c - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - password-validate - false - false - - - - - 2142f803-011b-44cb-834b-a71c16debb88 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - VBox - true - false - - - - - - - fe1ee732-1a3f-44ec-a6c4-caa6b0ee5151 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - Text - false - false - - - - - - - - dd4366b6-b12e-4426-8004-22b9d1cf5db8 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - HBox - true - false - - - - - - - db2236ac-ab9e-403c-bc96-3b4b6882ddf3 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - AvailableRecordsGrid - false - false - - - - - - - - - - 9ac36b9c-2c4e-46dc-9f62-e713bc4dac7c - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - Buttons - true - false - - - - - - -6b850ea5-255b-418c-be2d-5ec96d31e2bd -77d9d4a8-d9a5-47a3-b614-4f4f66893c98 -Add -false -false - - - - -3b902822-cad9-4f06-9ddc-48d48378a06e -77d9d4a8-d9a5-47a3-b614-4f4f66893c98 -AddAll -false -false - - - - -35c8b7b8-4527-4c67-b0cb-2755cd40ee5a -77d9d4a8-d9a5-47a3-b614-4f4f66893c98 -Remove -false -false - - - - -0263acc1-f1e9-44a6-b175-f679838a5d4a -77d9d4a8-d9a5-47a3-b614-4f4f66893c98 -RemoveAll -false -false - - - - - - 05d0feb4-fd4a-49c4-bd75-54866a194c49 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - LinkFieldDialog for save - false - false - - - - - - - - - - - - - - c34de737-90e6-4db0-a417-186a7ee0b8ad - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - HBox - true - false - - - - - - - 41b7094b-17d2-46cc-b2c3-a2ab5823a01a - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - save-button - false - false - - - - f70c25d7-0dcf-4d00-bec4-44a059217558 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - cancel-button - false - false - - - - - - 94939abc-6c57-464e-b480-c86ea7a689e9 - 77d9d4a8-d9a5-47a3-b614-4f4f66893c98 - Скрыть и сделать неактивным - false - false - - true - - - - - diff --git a/resources/src/main/resources/business-model/Управление пользователями/Пользователи создание.page b/resources/src/main/resources/business-model/Управление пользователями/Пользователи создание.page deleted file mode 100644 index ae8a242..0000000 --- a/resources/src/main/resources/business-model/Управление пользователями/Пользователи создание.page +++ /dev/null @@ -1,424 +0,0 @@ - - - user-management-user-create - - 3.172.3 - - - ru.cg.webbpm.packages.base.resources - 3.172.4 - - - - - 5f9c58f8-9ee1-4df3-b93c-e48534e798db - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - UsersCreate - true - false - - - - - - - e44fca88-2550-43a5-acc6-8b3d8a320f54 - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - Text - false - false - - - - - - - - dd8d4f7a-d682-4ad5-b912-2f893c80286c - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - Form - true - false - - - - - - - - 2d7ce830-8c41-45b4-ae68-65aa13bfd73d - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - HBox - true - false - - - - - - - 93142136-1c5f-48ee-bbed-735568f4dc5a - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - VBox - true - false - - - - - - - 262f4f43-1fce-4db7-a1e8-79cec29d193d - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - Text - false - false - - - - - - - - ef93e007-1dca-4b4b-9214-55e4206139f3 - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - last-name - false - false - - - - - - - - - 3267256f-78bd-46ca-ad92-e25f41660ec0 - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - first-name - false - false - - - - - - - - - f8710d37-2fb4-4a70-aae6-065e039c6456 - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - middleName - false - false - - - - - - - - - d561dee7-1216-4969-9e83-4c45ed4116cf - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - phone - false - false - - - - - - - - - 47505972-bba3-481f-8c60-573a3060ff51 - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - created - false - false - - - - - - - - 38387d09-b753-4ca7-9916-6e2745a913b6 - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - updated - false - false - - - - - - - - - b8f86b7b-bbfb-453d-b5d2-85fb75b89ce7 - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - VBox - true - false - - - - - - - 63ea4fcf-b2ea-493a-9127-7a4aa14b5a0b - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - Text - false - false - - - - - - - - 7d28a15a-bf1a-4dac-8637-a72b13595e78 - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - login - false - false - - - - - - - - - 4a616993-de8f-4b2f-b3e6-86f09cf6447c - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - password - false - false - - - - - - - - - - 040f3580-a20b-449c-8587-c9e399b5e6a2 - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - password-repeat - false - false - - - - - - - - 7d626425-0b20-4e2f-a3b3-7452f1a5df9e - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - email - false - false - - - - - - - - - 09c340df-f4bb-4cc6-9a9f-76b78dca7143 - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - password-changed - false - false - - - - - - - - 4d56ec4a-6df8-4a6c-8c44-d77c1a8099df - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - password-expires - false - false - - - - - - - - dad3e113-6fc0-4577-a730-a99af433b70b - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - org_unit_id - false - false - - - - - - - - - e1b037cb-0008-450f-8719-621422b6e155 - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - password-validate - false - false - - - - - f414d74e-2247-4e41-8280-638063712186 - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - VBox - true - false - - - - - - - 0b9b0cf3-55c1-4108-bea2-f70100ab92f2 - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - Text - false - false - - - - - - - - d148dfe4-0c8a-4bb2-94da-336d4399a7c4 - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - HBox - true - false - - - - - - - 7c06a3a6-1040-4bc0-bf3c-4760cd70335a - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - AvailableRecordsGrid - false - false - - - - - - - - - - 8bf9cb9b-edc5-4009-be41-c838c5d8e63d - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - Buttons - true - false - - - - - - -18cdf07c-f772-4be3-8eea-2ca5d3f651eb -42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 -Add -false -false - - - - -3074285f-453f-4ad2-8ae2-6cddaf5e8e0f -42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 -AddAll -false -false - - - - -1498ef4e-0a51-4dac-9b06-8d83263f03b4 -42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 -Remove -false -false - - - - -407e4d1d-7adf-415c-9ff6-19c4f2a8223f -42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 -RemoveAll -false -false - - - - - - 379fd159-d5a5-4b96-805b-0bae71b3f495 - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - LinkFieldDialog for save - false - false - - - - - - - - - - - - - - 8766dbfa-3bf8-4e80-9662-c9a9865ad15c - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - HBox - true - false - - - - - - - 796756c2-02da-4f18-9ab0-cae55047227a - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - save-button - false - false - - - - 95e88b88-64d3-482b-bc59-de692c3a44f6 - 42a604ab-8830-4fb9-bd8b-b3ca06ebdd46 - cancel-button - false - false - - - - - - diff --git a/resources/src/main/resources/business-model/Управление пользователями/Пользователи.page b/resources/src/main/resources/business-model/Управление пользователями/Пользователи.page deleted file mode 100644 index 29aa773..0000000 --- a/resources/src/main/resources/business-model/Управление пользователями/Пользователи.page +++ /dev/null @@ -1,555 +0,0 @@ - - - user-management-users - - 3.172.3 - - - ru.cg.webbpm.packages.base.resources - 3.172.4 - - - - - 0f470331-dfb0-4f10-b748-c9a7f33d31d9 - 245a43c7-6af2-45d7-ac76-9195075586a7 - Users - true - false - - - - - - - ea5eba30-e9c2-4b22-a31e-1f96336aba5a - 245a43c7-6af2-45d7-ac76-9195075586a7 - Text - false - false - - - - - - - - ce583acc-4291-4ca5-9b8c-d1830f568763 - 245a43c7-6af2-45d7-ac76-9195075586a7 - Сворачиваемая панель - true - false - - - - - - - 91582081-f678-4d59-aa8c-4461b9cf9041 - 245a43c7-6af2-45d7-ac76-9195075586a7 - FilterGroup - true - false - - - - filterableComp - -null - - - - - - - - filterable - -{"objectId":"d7266db0-3d4e-4e8c-9f63-19deb4c12ee3","packageName":"rpc","className":"GridRpcService","type":"JAVA"} - - - - - - - - - - 40211a7d-fa00-4355-9840-c79db51c1266 - 245a43c7-6af2-45d7-ac76-9195075586a7 - HBox - true - false - - - - - - - 982ee732-78fb-4937-8049-802b92307e41 - 245a43c7-6af2-45d7-ac76-9195075586a7 - VBox - true - false - - - - - - - 5f640a94-630c-4b5d-93de-ca4693859901 - 245a43c7-6af2-45d7-ac76-9195075586a7 - last-name - false - false - - - - - - - - - - aa610427-b2e3-4f3f-a8df-ee1aded6fe37 - 245a43c7-6af2-45d7-ac76-9195075586a7 - first-name - false - false - - - - - - - - - - 1d7465e8-260a-4581-9e37-77d8a5158b8f - 245a43c7-6af2-45d7-ac76-9195075586a7 - middle-name - false - false - - - - - - - - - - - 9c945c9c-4b2d-408b-a525-0c0d35e73d40 - 245a43c7-6af2-45d7-ac76-9195075586a7 - VBox - true - false - - - - - - - bed574e8-73e4-45e3-857c-ce7cd7c8156b - 245a43c7-6af2-45d7-ac76-9195075586a7 - login - false - false - - - - - - - - - - 840e4e3e-c178-404e-815e-16429e0b484d - 245a43c7-6af2-45d7-ac76-9195075586a7 - phone - false - false - - - - - - - - - - 104b37e8-9b20-4738-a978-a1f890c0d986 - 245a43c7-6af2-45d7-ac76-9195075586a7 - org_unit_id - false - false - - - - - - - - - - - ddbdddc4-09d7-45fc-91ce-a66bf6a7c3eb - 245a43c7-6af2-45d7-ac76-9195075586a7 - blocked - false - false - - - - - - - - - - - - - 4e5e921a-39ed-40e4-90a6-5087ae66c6c9 - 245a43c7-6af2-45d7-ac76-9195075586a7 - Form - true - false - - - - - - - - 98868f0f-1d43-40a4-ad6d-ba2961e6cff4 - 245a43c7-6af2-45d7-ac76-9195075586a7 - Горизонтальный контейнер - true - false - - - - - - - 959d104a-1e3f-4ac2-be5e-7d7b90f66a5f - 245a43c7-6af2-45d7-ac76-9195075586a7 - Вертикальный контейнер - true - false - - - - - - - e5be7900-dfec-4748-91da-c715fee6cac4 - 245a43c7-6af2-45d7-ac76-9195075586a7 - full-name - false - false - - - - - - - - - 0c9190f0-0784-4f04-9859-4f0fbaf00f74 - 245a43c7-6af2-45d7-ac76-9195075586a7 - blocked - false - false - - - - - - - - - 0c4e9e51-0ee4-479f-8f09-c7e46909ff44 - 245a43c7-6af2-45d7-ac76-9195075586a7 - Вертикальный контейнер - true - false - - - - - - - 8b2e2c4f-6b66-4d6f-bd0c-a89e539356bb - 245a43c7-6af2-45d7-ac76-9195075586a7 - password-expires - false - false - - - - - - - - d042fd93-60b2-4efe-86b0-f38023bb9a7f - 245a43c7-6af2-45d7-ac76-9195075586a7 - created - false - false - - - - - - - - - - - 9e35c92d-2741-4d9d-867f-4c8b83166638 - 245a43c7-6af2-45d7-ac76-9195075586a7 - HBox - true - false - - - - - - - 66b422e9-0f90-4114-ba87-4a235cbf7648 - 245a43c7-6af2-45d7-ac76-9195075586a7 - VBox - true - false - - - - - - - d7266db0-3d4e-4e8c-9f63-19deb4c12ee3 - 245a43c7-6af2-45d7-ac76-9195075586a7 - Grid - false - false - - - - - - - - c7ac179d-9577-4703-8313-1c2c4c90ac36 - 245a43c7-6af2-45d7-ac76-9195075586a7 - VBox - true - false - - - - - - - d3f54b16-ae69-4685-a071-4f781c3f9b61 - 245a43c7-6af2-45d7-ac76-9195075586a7 - DependentGrid - false - false - - - - - - - - 4d7361c8-5071-4d62-b50e-e79ee636fa57 - 245a43c7-6af2-45d7-ac76-9195075586a7 - ac-dependent-grid - false - false - false - - true - - - - - - - c4f7ba4d-03b3-4948-86ed-2ca4b8a6631b - 245a43c7-6af2-45d7-ac76-9195075586a7 - HBox - true - false - - - - - - - - a034e0fd-82dd-40c8-bada-c3a0d6eebeb5 - 245a43c7-6af2-45d7-ac76-9195075586a7 - create-button - false - false - - - - - - d45bf7b0-dcab-48f6-a53b-26723524b371 - 245a43c7-6af2-45d7-ac76-9195075586a7 - edit-button - false - false - - - - - - 3d6e68c8-b745-49bb-a5d5-d27f5fdad72d - 245a43c7-6af2-45d7-ac76-9195075586a7 - delete-button - false - false - - - - - - - 98d7a384-bac4-4b95-9d8f-9245d91927c1 - 245a43c7-6af2-45d7-ac76-9195075586a7 - ldap-sync-button - false - false - - - - - dacfb992-f471-468a-b8bc-2fe3b916a2f7 - 245a43c7-6af2-45d7-ac76-9195075586a7 - clear-security-cache-btn - false - false - - - - - a72d531c-3c9f-4390-8b7a-1f6bb3fa0e9d - 245a43c7-6af2-45d7-ac76-9195075586a7 - ac-edit - false - false - false - - true - - - - - 250006ff-42d5-4c45-87f3-183857d7a13b - 245a43c7-6af2-45d7-ac76-9195075586a7 - ac-remove - false - false - false - - true - - - - - 696aaf8c-3075-4d6a-b58b-c7c79394affe - 245a43c7-6af2-45d7-ac76-9195075586a7 - ac-create-button-hide-if-kerberos-or-no-authority - false - false - - true - - - - - 8b27dfb0-9d38-492b-8ee2-100d6c5a58d7 - 245a43c7-6af2-45d7-ac76-9195075586a7 - ac-edit-button-hide-if-kerberos-or-no-authority - false - false - - true - - - - - 6377bc60-5a59-42d9-b5f1-3ccefac4ffe4 - 245a43c7-6af2-45d7-ac76-9195075586a7 - ac-edit-button-enabled-if-has-authority - false - false - - true - - - - - 7b63ea1b-1c51-4237-8946-14cc474d5eb0 - 245a43c7-6af2-45d7-ac76-9195075586a7 - ac-delete-button-hide-if-kerberos-or-no-authority - false - false - - true - - - - - 7af3269d-369f-4a2a-85e7-8e4b621da324 - 245a43c7-6af2-45d7-ac76-9195075586a7 - ac-delete-button-enabled-if-has-authority - false - false - - true - - - - - 3f2cb52c-a805-4bbd-a893-48506a2ee1cf - 245a43c7-6af2-45d7-ac76-9195075586a7 - ac-ldap-sync-button - false - false - - true - - - - - af550f44-c563-4e73-9703-a8dfd73f4627 - 245a43c7-6af2-45d7-ac76-9195075586a7 - ac-clear-security-cache-btn - false - true - false - - - - e3ed2a20-be7f-4ee3-a85c-29bcffad04dc - 245a43c7-6af2-45d7-ac76-9195075586a7 - hide-if-kerberos - false - false - - true - - - - - - diff --git a/resources/src/main/resources/business-model/Управление пользователями/Роли редактирование (создание).page b/resources/src/main/resources/business-model/Управление пользователями/Роли редактирование (создание).page deleted file mode 100644 index c579a70..0000000 --- a/resources/src/main/resources/business-model/Управление пользователями/Роли редактирование (создание).page +++ /dev/null @@ -1,152 +0,0 @@ - - - user-management-role - - 3.172.3 - - - ru.cg.webbpm.packages.base.resources - 3.172.4 - - - - - a6f1a48d-fc19-46fd-9cad-e7fe0d9f29c6 - 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 - RolesEdit - true - false - - - - - - - 90fc7ebc-3819-4bc5-b2a4-b0dae9b151ea - 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 - Текст - false - false - - - - - - - - 183f1b4b-6c93-4858-ad6e-1d3ac3d3d6f1 - 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 - Form - true - false - - - - - - - - 61750ac1-fa74-4c35-9057-d0bead8241cc - 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 - Горизонтальный контейнер - true - false - - - - - - - 5047ac15-2114-48db-b457-3cca811df6f4 - 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 - Вертикальный контейнер - true - false - - - - - - - b8514208-f422-488a-82ab-fc8eca271a82 - 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 - name - false - false - - - - - - - - - be586ede-3dcb-4ef9-a5ac-4ecdaff22d42 - 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 - created - false - false - - - - - - - - - 01a7320b-31b6-4809-bc2e-aafeefcc2bdb - 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 - updated - false - false - - - - - - - - - 50797ba0-3422-4b3c-95d8-924cd5160d2f - 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 - Вертикальный контейнер - true - false - - - - - - - - - - 9a80540c-888a-46cf-94d0-6aa060704cdf - 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 - HBox - true - false - - - - - - - 0e3729c9-6ec2-4d22-8146-1e6c4f69e132 - 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 - save-button - false - false - - - - 0bfe5e99-bdcd-475a-a524-17e0603b3845 - 72f6fc40-525b-466c-86f8-3dc4e1c21bb7 - cancel-button - false - false - - - - - diff --git a/resources/src/main/resources/business-model/Управление пользователями/Роли.page b/resources/src/main/resources/business-model/Управление пользователями/Роли.page deleted file mode 100644 index 0cc1975..0000000 --- a/resources/src/main/resources/business-model/Управление пользователями/Роли.page +++ /dev/null @@ -1,192 +0,0 @@ - - - user-management-roles - - 3.172.3 - - - ru.cg.webbpm.packages.base.resources - 3.172.4 - - - - - 38c2de2f-c5dd-413e-babf-ce54cb4e5279 - 3ada7790-8f63-4750-be1b-965cb607bc17 - Roles - true - false - - - - - - - 47e95cb8-ec90-4d23-bdbc-02a993cba433 - 3ada7790-8f63-4750-be1b-965cb607bc17 - Text - false - false - - - - - - - - 5caea80b-ba43-4d5a-ae62-cf1aa1b5e8de - 3ada7790-8f63-4750-be1b-965cb607bc17 - FilterGroup - true - false - - - - filterableComp - - null - - - - - - - - filterable - - {"objectId":"a56dd87e-02e2-4dd5-9dc7-ec94e3758511","packageName":"rpc","className":"GridRpcService","type":"JAVA"} - - - - - - - - - - 4c6be823-5f06-4a7c-b965-944a778f96b4 - 3ada7790-8f63-4750-be1b-965cb607bc17 - search - false - false - - - - - - - - - - - a56dd87e-02e2-4dd5-9dc7-ec94e3758511 - 3ada7790-8f63-4750-be1b-965cb607bc17 - Grid - false - false - - - - - - - 9a8e1a6b-5cd8-4b6e-b3ec-8da88c6018a2 - 3ada7790-8f63-4750-be1b-965cb607bc17 - HBox - true - false - - - - - - - d5af9dbe-a63f-4420-a109-dcd5d6894355 - 3ada7790-8f63-4750-be1b-965cb607bc17 - create-button - false - false - - - - - 29d2fdef-ff61-4689-bded-2c34bff0de72 - 3ada7790-8f63-4750-be1b-965cb607bc17 - edit-button - false - false - - - - - 7fbf947c-b03a-42f1-881d-0f0d449cb1d2 - 3ada7790-8f63-4750-be1b-965cb607bc17 - delete-button - false - false - - - - - - fca14225-0522-4cc8-ad0d-1126644cf028 - 3ada7790-8f63-4750-be1b-965cb607bc17 - ac-create - false - false - false - - true - - - - - b801dc2c-9067-4669-8bba-620bdde0be51 - 3ada7790-8f63-4750-be1b-965cb607bc17 - ac-edit - false - false - false - - true - - - - - eedf3b3b-c42c-4b81-94ce-3b5cc3c6bd07 - 3ada7790-8f63-4750-be1b-965cb607bc17 - ac-remove - false - false - false - - true - - - - - - 86bc12ae-bb9f-42d6-b111-63f7521fedb6 - 3ada7790-8f63-4750-be1b-965cb607bc17 - Groups - false - false - - - - - - - - ab666d58-a9b4-417c-9da9-eab2e0b6a958 - 3ada7790-8f63-4750-be1b-965cb607bc17 - GroupsGrid - false - false - - - - - - - diff --git a/resources/src/main/resources/business-model/Управление пользователями/Функции безопасности.page b/resources/src/main/resources/business-model/Управление пользователями/Функции безопасности.page deleted file mode 100644 index 0c5dc6f..0000000 --- a/resources/src/main/resources/business-model/Управление пользователями/Функции безопасности.page +++ /dev/null @@ -1,276 +0,0 @@ - - - user-management-authorities - - 3.172.3 - - - ru.cg.webbpm.packages.base.resources - 3.172.4 - - - - - a4d442cf-72a8-431e-815a-490959083787 - 44886585-d33e-4203-840a-e788653e923a - SecurityFeatures - true - false - - - - - - - 202de44d-f77d-43fb-88fd-2a3f36ced2f1 - 44886585-d33e-4203-840a-e788653e923a - Вертикальный контейнер - true - false - - - - - - - 2abf5d6a-d876-4fc5-bae1-d04e41cb7229 - 44886585-d33e-4203-840a-e788653e923a - authorities - false - false - - - - - - - d084be86-0037-4780-893d-959b975b9058 - 44886585-d33e-4203-840a-e788653e923a - Вертикальный контейнер - true - false - - - - - - - 753dd01d-822b-4533-b2aa-f086edb81702 - 44886585-d33e-4203-840a-e788653e923a - bound-roles - false - false - - - - - - - c0460450-a21e-42f2-b9f6-f29e63a909eb - 44886585-d33e-4203-840a-e788653e923a - Горизонтальный контейнер - true - false - - - - - - - 67f2e8a8-e32b-4bf0-940b-ab505be146f9 - 44886585-d33e-4203-840a-e788653e923a - delete - false - false - - - - - - c4751b6c-abb3-44e7-9f4d-7b1887d736d1 - 44886585-d33e-4203-840a-e788653e923a - Горизонтальный контейнер - true - false - - - - - - - d6b561b0-cf80-493f-8499-1c4646a12848 - 44886585-d33e-4203-840a-e788653e923a - show-dialog - false - false - - - - - 1704b964-7410-4909-81af-baa39019103c - 44886585-d33e-4203-840a-e788653e923a - Диалог - true - false - - - - - - - 2aecaba7-557f-4628-abf9-2ae64d9c136d - 44886585-d33e-4203-840a-e788653e923a - Вертикальный контейнер - true - false - - - - - - -a07d0119-b9d5-465f-a8e5-991fb0ae5dd3 -44886585-d33e-4203-840a-e788653e923a -Форма -true -false - - - - - - - - 5d81f881-411c-40b7-8eba-9ebb880ce4ab - 44886585-d33e-4203-840a-e788653e923a - authority-id - false - false - - - - - - - - - a413592c-bd84-48e5-a6f0-af87cd075640 - 44886585-d33e-4203-840a-e788653e923a - Action controller - false - false - false - - true - - - - - 9e81c3a0-4b1c-46af-a28f-78510fac789f - 44886585-d33e-4203-840a-e788653e923a - role - false - false - - - - - - - - - -2b2ae47e-ec3a-48bd-a4cf-77a3a817ebe6 -44886585-d33e-4203-840a-e788653e923a -Горизонтальный контейнер -true -false - - - - - - - 1f65aebc-3112-4336-8339-db6aae6574cf - 44886585-d33e-4203-840a-e788653e923a - save - false - false - - - - c3f258bb-9843-4f97-acbf-492ddd583a5b - 44886585-d33e-4203-840a-e788653e923a - cancel - false - false - - - - 5f3abfc2-545a-4e30-961b-e5ae5388a5d6 - 44886585-d33e-4203-840a-e788653e923a - show-action - false - false - false - - true - - - - - - - - 828a292b-3fd3-46da-b0af-22c7dbbffa4f - 44886585-d33e-4203-840a-e788653e923a - hide-on-cancel-action - false - false - false - - true - - - - - 1e99095a-60eb-4612-be43-e8dacad53e49 - 44886585-d33e-4203-840a-e788653e923a - on-save-action - false - false - false - - true - - - - - b5722d45-1042-4ea0-a94f-aed3ad0f11ea - 44886585-d33e-4203-840a-e788653e923a - ac-role-unbind - false - false - false - - true - - - - - 255d2278-be77-4af9-b599-48dba63695bf - 44886585-d33e-4203-840a-e788653e923a - ac-role-bind - false - false - false - - true - - - - - - - - From 799fa0d23d17b14a79f740fe9bb59544113a32d1 Mon Sep 17 00:00:00 2001 From: kochetkov Date: Wed, 17 Jul 2024 12:36:21 +0300 Subject: [PATCH 02/24] SUPPORT-8426 fix db connect --- resources/src/main/resources/database/datasource.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/src/main/resources/database/datasource.xml b/resources/src/main/resources/database/datasource.xml index 4099d21..4d5f2f1 100644 --- a/resources/src/main/resources/database/datasource.xml +++ b/resources/src/main/resources/database/datasource.xml @@ -3,14 +3,14 @@ ervu_lkrp_fl.ervu_lkrp_fl.db_beans ervu-lkrp-fl org.postgresql.Driver - 10.10.31.121 + 10.10.31.119 false ervu-lkrp-fl 5432 public security POSTGRES - jdbc:postgresql://10.10.31.121:5432/ervu-lkrp-fl + jdbc:postgresql://10.10.31.119:5432/ervu-lkrp-fl jdbc:postgresql: ervu-lkrp-fl From 75f1190414f43d2ff4c6db7e285d335cf1eb2327 Mon Sep 17 00:00:00 2001 From: kochetkov Date: Wed, 17 Jul 2024 13:49:32 +0300 Subject: [PATCH 03/24] SUPPORT-8426 remove security files and some unused --- frontend/preview.html | 2 +- .../template/app/component/admin_menu.html | 34 -- .../template/app/component/app_header.html | 13 +- .../app/component/confirm-user-email.html | 27 -- .../template/app/component/log_out.html | 11 - .../template/app/component/login.html | 49 --- .../template/app/component/new_password.html | 103 ------ .../template/app/component/process_list.html | 12 - .../template/app/component/register.html | 121 ------- .../app/component/reset_password.html | 45 --- .../template/app/component/task.html | 3 - .../template/app/component/task_list.html | 49 --- .../app/component/task_not_found.html | 8 - .../src/ts/modules/app/app-routing.module.ts | 63 +--- frontend/src/ts/modules/app/app.module.ts | 24 +- .../app/component/admin-menu.component.ts | 23 -- .../app/component/app-header.component.ts | 2 - .../component/confirm-user-email.component.ts | 51 --- .../modules/app/component/login.component.ts | 68 ---- .../modules/app/component/logout.component.ts | 37 --- .../app/component/new-password.component.ts | 79 ----- .../app/component/process-list.component.ts | 44 --- .../app/component/register.component.ts | 71 ----- .../app/component/reset-password.component.ts | 30 -- .../app/component/task-list.component.ts | 121 ------- .../app/component/task-not-found.component.ts | 18 -- .../modules/app/component/task.component.ts | 9 - .../app/service/app-jivo-chat.service.ts | 298 ------------------ .../webbpm/component/webbpm.component.ts | 4 +- .../modules/webbpm/webbpm-routing.module.ts | 24 +- .../src/ts/modules/webbpm/webbpm.module.ts | 7 - 31 files changed, 13 insertions(+), 1437 deletions(-) delete mode 100644 frontend/src/resources/template/app/component/admin_menu.html delete mode 100644 frontend/src/resources/template/app/component/confirm-user-email.html delete mode 100644 frontend/src/resources/template/app/component/log_out.html delete mode 100644 frontend/src/resources/template/app/component/login.html delete mode 100644 frontend/src/resources/template/app/component/new_password.html delete mode 100644 frontend/src/resources/template/app/component/process_list.html delete mode 100644 frontend/src/resources/template/app/component/register.html delete mode 100644 frontend/src/resources/template/app/component/reset_password.html delete mode 100644 frontend/src/resources/template/app/component/task.html delete mode 100644 frontend/src/resources/template/app/component/task_list.html delete mode 100644 frontend/src/resources/template/app/component/task_not_found.html delete mode 100644 frontend/src/ts/modules/app/component/admin-menu.component.ts delete mode 100644 frontend/src/ts/modules/app/component/confirm-user-email.component.ts delete mode 100644 frontend/src/ts/modules/app/component/login.component.ts delete mode 100644 frontend/src/ts/modules/app/component/logout.component.ts delete mode 100644 frontend/src/ts/modules/app/component/new-password.component.ts delete mode 100644 frontend/src/ts/modules/app/component/process-list.component.ts delete mode 100644 frontend/src/ts/modules/app/component/register.component.ts delete mode 100644 frontend/src/ts/modules/app/component/reset-password.component.ts delete mode 100644 frontend/src/ts/modules/app/component/task-list.component.ts delete mode 100644 frontend/src/ts/modules/app/component/task-not-found.component.ts delete mode 100644 frontend/src/ts/modules/app/component/task.component.ts delete mode 100644 frontend/src/ts/modules/app/service/app-jivo-chat.service.ts diff --git a/frontend/preview.html b/frontend/preview.html index 2289a0d..1b074a7 100644 --- a/frontend/preview.html +++ b/frontend/preview.html @@ -18,7 +18,7 @@ }); - +
diff --git a/frontend/src/resources/template/app/component/admin_menu.html b/frontend/src/resources/template/app/component/admin_menu.html deleted file mode 100644 index f187ba8..0000000 --- a/frontend/src/resources/template/app/component/admin_menu.html +++ /dev/null @@ -1,34 +0,0 @@ -
- -
- - - - - - -
-
\ No newline at end of file diff --git a/frontend/src/resources/template/app/component/app_header.html b/frontend/src/resources/template/app/component/app_header.html index 5262eb3..7bb0833 100644 --- a/frontend/src/resources/template/app/component/app_header.html +++ b/frontend/src/resources/template/app/component/app_header.html @@ -1,16 +1,9 @@ -