Merge branch 'feature/SUPPORT-9129_fix_pages' into develop
This commit is contained in:
Eduard Tihomirov
commit
5c613ed9c3
5 changed files with 2 additions and 139 deletions
|
|
@ -5,11 +5,6 @@ import {RolesGuard} from "./guard/RolesGuard";
|
||||||
|
|
||||||
|
|
||||||
const appRoutes: Routes = [
|
const appRoutes: Routes = [
|
||||||
{
|
|
||||||
path: 'home',
|
|
||||||
loadChildren: 'generated-sources/page-home.module#PagehomeModule',
|
|
||||||
canActivate: [ConfirmExitGuard, RolesGuard]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
path: 'app_list',
|
path: 'app_list',
|
||||||
loadChildren: 'generated-sources/page-app_list.module#Pageapp_listModule',
|
loadChildren: 'generated-sources/page-app_list.module#Pageapp_listModule',
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ const webbpmRoutes: Routes = [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '',
|
path: '',
|
||||||
loadChildren: 'generated-sources/page-home.module#PagehomeModule',
|
loadChildren: 'generated-sources/page-app_list.module#Pageapp_listModule',
|
||||||
canActivate: [ConfirmExitGuard, RolesGuard],
|
canActivate: [ConfirmExitGuard, RolesGuard],
|
||||||
pathMatch: 'full',
|
pathMatch: 'full',
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ const webbpmRoutes: Routes = [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '',
|
path: '',
|
||||||
loadChildren: 'generated-sources/page-home.module#PagehomeModule',
|
loadChildren: 'generated-sources/page-app_list.module#Pageapp_listModule',
|
||||||
canActivate: [ConfirmExitGuard, RolesGuard],
|
canActivate: [ConfirmExitGuard, RolesGuard],
|
||||||
pathMatch: 'full',
|
pathMatch: 'full',
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -1,94 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
|
||||||
<xmlPage>
|
|
||||||
<id>home</id>
|
|
||||||
<versions>
|
|
||||||
<studioVersion>3.192.3</studioVersion>
|
|
||||||
<packageVersions>
|
|
||||||
<entry>
|
|
||||||
<key>ru.cg.webbpm.packages.base.resources</key>
|
|
||||||
<value>3.192.3</value>
|
|
||||||
</entry>
|
|
||||||
</packageVersions>
|
|
||||||
</versions>
|
|
||||||
<rootObjects id="b0d8793f-51d3-49c2-b2d4-a6b4b6d8f037">
|
|
||||||
<prototypeId>d7d54cfb-26b5-4dba-b56f-b6247183c24d</prototypeId>
|
|
||||||
<componentRootId>b0d8793f-51d3-49c2-b2d4-a6b4b6d8f037</componentRootId>
|
|
||||||
<name>Hbox</name>
|
|
||||||
<container>true</container>
|
|
||||||
<childrenReordered>false</childrenReordered>
|
|
||||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
|
|
||||||
<properties>
|
|
||||||
<entry>
|
|
||||||
<key>cssClasses</key>
|
|
||||||
<value>
|
|
||||||
<item id="e2039705-146c-45b9-adb5-315f4bfcd7b6" removed="false">
|
|
||||||
<value>
|
|
||||||
<simple>"btn-big-group"</simple>
|
|
||||||
</value>
|
|
||||||
</item>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
</properties>
|
|
||||||
</scripts>
|
|
||||||
<scripts id="b6068710-0f31-48ec-8e03-c0c1480a40c0"/>
|
|
||||||
<scripts id="fe04d7fb-6c5b-46c4-b723-667732d81f4f"/>
|
|
||||||
<scripts id="5c566210-2a60-4048-a2d1-84c7dd023248"/>
|
|
||||||
<scripts id="3171b2e1-b4af-4335-95fa-1b2592604b84"/>
|
|
||||||
<children id="240c9b7b-b6a5-40c9-82f3-c54924205a32">
|
|
||||||
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
|
|
||||||
<componentRootId>240c9b7b-b6a5-40c9-82f3-c54924205a32</componentRootId>
|
|
||||||
<name>Vbox</name>
|
|
||||||
<container>true</container>
|
|
||||||
<expanded>false</expanded>
|
|
||||||
<childrenReordered>false</childrenReordered>
|
|
||||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
|
|
||||||
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
|
|
||||||
<scripts id="87f3fefa-b77b-4137-aab6-b2bcd83ce380"/>
|
|
||||||
<scripts id="ef21ca22-3f81-4484-ba6f-58d670c12d4f"/>
|
|
||||||
<scripts id="277e6fbc-9e2e-4080-bf20-5d8be18e6764"/>
|
|
||||||
<children id="5efb3252-df02-47da-8e3d-dc4517b3fc9f">
|
|
||||||
<prototypeId>c8dfe691-a84a-48da-b79e-6298d90db71d</prototypeId>
|
|
||||||
<componentRootId>5efb3252-df02-47da-8e3d-dc4517b3fc9f</componentRootId>
|
|
||||||
<name>Список пользователей</name>
|
|
||||||
<container>false</container>
|
|
||||||
<removed>true</removed>
|
|
||||||
</children>
|
|
||||||
</children>
|
|
||||||
<children id="e8dc240c-e610-49c9-8f0e-df53dde5eff2">
|
|
||||||
<prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
|
|
||||||
<componentRootId>e8dc240c-e610-49c9-8f0e-df53dde5eff2</componentRootId>
|
|
||||||
<name>Vbox</name>
|
|
||||||
<container>true</container>
|
|
||||||
<childrenReordered>false</childrenReordered>
|
|
||||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f"/>
|
|
||||||
<scripts id="72befe90-1915-483f-b88c-d1ec5d4bdc8e"/>
|
|
||||||
<scripts id="87f3fefa-b77b-4137-aab6-b2bcd83ce380"/>
|
|
||||||
<scripts id="ef21ca22-3f81-4484-ba6f-58d670c12d4f"/>
|
|
||||||
<scripts id="277e6fbc-9e2e-4080-bf20-5d8be18e6764"/>
|
|
||||||
<children id="5ace6303-ecf8-40a2-ad53-3dc08b46c1e0">
|
|
||||||
<prototypeId>c8dfe691-a84a-48da-b79e-6298d90db71d</prototypeId>
|
|
||||||
<componentRootId>5ace6303-ecf8-40a2-ad53-3dc08b46c1e0</componentRootId>
|
|
||||||
<name>Список заявок</name>
|
|
||||||
<container>false</container>
|
|
||||||
<expanded>false</expanded>
|
|
||||||
<childrenReordered>false</childrenReordered>
|
|
||||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
|
|
||||||
<properties>
|
|
||||||
<entry>
|
|
||||||
<key>caption</key>
|
|
||||||
<value>
|
|
||||||
<simple>"Список заявок"</simple>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<key>navigateTo</key>
|
|
||||||
<value>
|
|
||||||
<simple>"/app_list"</simple>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
</properties>
|
|
||||||
</scripts>
|
|
||||||
</children>
|
|
||||||
</children>
|
|
||||||
</rootObjects>
|
|
||||||
</xmlPage>
|
|
||||||
|
|
@ -6002,44 +6002,6 @@
|
||||||
<scripts id="fe04d7fb-6c5b-46c4-b723-667732d81f4f"/>
|
<scripts id="fe04d7fb-6c5b-46c4-b723-667732d81f4f"/>
|
||||||
<scripts id="5c566210-2a60-4048-a2d1-84c7dd023248"/>
|
<scripts id="5c566210-2a60-4048-a2d1-84c7dd023248"/>
|
||||||
<scripts id="3171b2e1-b4af-4335-95fa-1b2592604b84"/>
|
<scripts id="3171b2e1-b4af-4335-95fa-1b2592604b84"/>
|
||||||
<children id="ed485923-da58-4370-8522-9b34be995953">
|
|
||||||
<prototypeId>c8dfe691-a84a-48da-b79e-6298d90db71d</prototypeId>
|
|
||||||
<componentRootId>ed485923-da58-4370-8522-9b34be995953</componentRootId>
|
|
||||||
<name>Выход</name>
|
|
||||||
<container>false</container>
|
|
||||||
<childrenReordered>false</childrenReordered>
|
|
||||||
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
|
|
||||||
<removed>true</removed>
|
|
||||||
</scripts>
|
|
||||||
<scripts id="10c7c68b-9e68-4fa6-abc2-edc98d8e9fa3">
|
|
||||||
<classRef type="TS">
|
|
||||||
<className>StaticRouteNavigationButton</className>
|
|
||||||
<packageName>modules.user-management.component</packageName>
|
|
||||||
</classRef>
|
|
||||||
<enabled>true</enabled>
|
|
||||||
<expanded>true</expanded>
|
|
||||||
<properties>
|
|
||||||
<entry>
|
|
||||||
<key>caption</key>
|
|
||||||
<value>
|
|
||||||
<simple>"Выход"</simple>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<key>route</key>
|
|
||||||
<value>
|
|
||||||
<simple>"/home"</simple>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry>
|
|
||||||
<key>visible</key>
|
|
||||||
<value>
|
|
||||||
<simple>true</simple>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
</properties>
|
|
||||||
</scripts>
|
|
||||||
</children>
|
|
||||||
</rootObjects>
|
</rootObjects>
|
||||||
<rootObjects id="e4f91512-684f-4db0-8868-65fd9464076e">
|
<rootObjects id="e4f91512-684f-4db0-8868-65fd9464076e">
|
||||||
<prototypeId>86f297f1-ab3d-40e0-ac2f-89cc944b7f0a</prototypeId>
|
<prototypeId>86f297f1-ab3d-40e0-ac2f-89cc944b7f0a</prototypeId>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue