diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod index eba6a0902171df7e8d2780f911da2290bb745f5c..c7885b16e578bdd48701e7afa944bb89b8ce06e1 100644 --- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod +++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod @@ -43,6 +43,8 @@ <node name="KeywordEntry" kind="10077" /> <node name="KeywordAttribute" kind="10077" /> <node name="ObjectRelationType" kind="10077" /> + <node name="PermissionMetaData" kind="10077" /> + <node name="Role" kind="10077" /> <node name="INTERNAL_ADMINISTRATOR" kind="159" /> </node> </node> diff --git a/entity/PermissionAction_entity/PermissionAction_entity.aod b/entity/PermissionAction_entity/PermissionAction_entity.aod index e83f384288ac970d4c7849447986e4dc4181133a..8cc0fe990e0063eed109f0c97a7c2dd3d42894c7 100644 --- a/entity/PermissionAction_entity/PermissionAction_entity.aod +++ b/entity/PermissionAction_entity/PermissionAction_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4"> <name>PermissionAction_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> <iconId>VAADIN:SHIELD</iconId> diff --git a/entity/PermissionAdmin_entity/PermissionAdmin_entity.aod b/entity/PermissionAdmin_entity/PermissionAdmin_entity.aod index 02987cdea0e2036d81094ac735ab66709e659670..9ae9e623229e5a878c67f441a9f917c9a991657d 100644 --- a/entity/PermissionAdmin_entity/PermissionAdmin_entity.aod +++ b/entity/PermissionAdmin_entity/PermissionAdmin_entity.aod @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4"> <name>PermissionAdmin_entity</name> - <title>Permission Admin</title> <majorModelMode>DISTRIBUTED</majorModelMode> + <title>Permission Admin</title> <iconId>VAADIN:SHIELD</iconId> <recordContainer>JDito</recordContainer> <entityFields> diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod index 88d71e1a4bd76ae57b01cc2d657d38b8ce92a687..ee58307dd41995daa4453a050cb3b0be84072cb2 100644 --- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod +++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4"> <name>PermissionDetail_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> + <title>Permission Detail</title> + <contentTitleProcess>%aditoprj%/entity/PermissionDetail_entity/contentTitleProcess.js</contentTitleProcess> <iconIdProcess>%aditoprj%/entity/PermissionDetail_entity/iconIdProcess.js</iconIdProcess> - <titleProcess>%aditoprj%/entity/PermissionDetail_entity/titleProcess.js</titleProcess> <recordContainer>jDito</recordContainer> <entityFields> <entityProvider> @@ -25,6 +26,7 @@ <consumer>Roles</consumer> <linkedContext>Role</linkedContext> <groupable v="true" /> + <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/role/valueProcess.js</valueProcess> </entityField> <entityField> <name>ENTITY</name> @@ -32,6 +34,7 @@ <consumer>MetaData</consumer> <linkedContext>PermissionMetaData</linkedContext> <groupable v="true" /> + <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js</valueProcess> </entityField> <entityField> <name>FIELD</name> diff --git a/entity/PermissionDetail_entity/titleProcess.js b/entity/PermissionDetail_entity/contentTitleProcess.js similarity index 100% rename from entity/PermissionDetail_entity/titleProcess.js rename to entity/PermissionDetail_entity/contentTitleProcess.js diff --git a/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js b/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js index d6026ea916df2bc6aa670a580d33d7c1dcae74e1..8d0ed5002abe588d334cf6a609d98472d5d13bf5 100644 --- a/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js +++ b/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js @@ -3,4 +3,4 @@ import("system.vars"); import("Keyword_lib"); import("KeywordRegistry_basic"); -result.string(KeywordUtils.getViewValue($KeywordRegistry.permissionConditionType(), vars.get("$field.CONDTYPE"))); +//result.string(KeywordUtils.getViewValue($KeywordRegistry.permissionConditionType(), vars.get("$field.CONDTYPE"))); diff --git a/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js b/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..ace2def782d998df24500b8fb7e0792e651e77da --- /dev/null +++ b/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js @@ -0,0 +1,7 @@ +import("system.vars"); +import("system.result"); +import("system.neon"); + +if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && vars.exists("$param.EntityTitle_param")) { + result.string(vars.getString("$param.EntityTitle_param")); +} \ No newline at end of file diff --git a/entity/PermissionDetail_entity/entityfields/role/valueProcess.js b/entity/PermissionDetail_entity/entityfields/role/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..ce210d3aefbd85ebf0b4fc106ea5a25976284f1b --- /dev/null +++ b/entity/PermissionDetail_entity/entityfields/role/valueProcess.js @@ -0,0 +1,7 @@ +import("system.vars"); +import("system.result"); +import("system.neon"); + +if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && vars.exists("$param.RoleTitle_param")) { + result.string(vars.getString("$param.RoleTitle_param")); +} \ No newline at end of file diff --git a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod index f12dbb0c024cbafddd9afac66238da71c3270725..650ac71d939ff5f656a201c88f9584e74e1ce559 100644 --- a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod +++ b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4"> <name>PermissionMetaData_entity</name> - <title>Entities</title> <majorModelMode>DISTRIBUTED</majorModelMode> <icon>VAADIN:CONNECT</icon> + <title>Entities</title> + <contentTitleProcess>%aditoprj%/entity/PermissionMetaData_entity/contentTitleProcess.js</contentTitleProcess> <iconId>VAADIN:CONNECT</iconId> - <titleProcess>%aditoprj%/entity/PermissionMetaData_entity/titleProcess.js</titleProcess> <recordContainer>jDito</recordContainer> <entityFields> <entityProvider> @@ -35,10 +35,15 @@ <isConsumer v="false" /> </entityDependency> </dependencies> + <children> + <entityParameter> + <name>EntityName_param</name> + <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js</valueProcess> + </entityParameter> + </children> </entityProvider> <entityConsumer> <name>PermissionOverviews</name> - <title>Permission Overview</title> <fieldType>DEPENDENCY_OUT</fieldType> <dependency> <name>dependency</name> @@ -54,7 +59,6 @@ </entityConsumer> <entityConsumer> <name>PermissionDetails</name> - <title>Permission Detail</title> <fieldType>DEPENDENCY_OUT</fieldType> <dependency> <name>dependency</name> @@ -68,6 +72,11 @@ </entityParameter> </children> </entityConsumer> + <entityParameter> + <name>EntityName_param</name> + <expose v="true" /> + <description>PARAMETER</description> + </entityParameter> </entityFields> <recordContainers> <jDitoRecordContainer> diff --git a/entity/PermissionMetaData_entity/titleProcess.js b/entity/PermissionMetaData_entity/contentTitleProcess.js similarity index 100% rename from entity/PermissionMetaData_entity/titleProcess.js rename to entity/PermissionMetaData_entity/contentTitleProcess.js diff --git a/entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js b/entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..f7920ec1e28cce2af69f1ef57710f594d31d2553 --- /dev/null +++ b/entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js @@ -0,0 +1,3 @@ +import("system.vars"); +import("system.result"); +result.string(vars.get("$field.TITLE")); \ No newline at end of file diff --git a/entity/PermissionOverview_entity/PermissionOverview_entity.aod b/entity/PermissionOverview_entity/PermissionOverview_entity.aod index a34ba47055c5db87ca35db41306a605bbd13bbcd..a9c32b001df25a7294ee1f7de89b9796f7661573 100644 --- a/entity/PermissionOverview_entity/PermissionOverview_entity.aod +++ b/entity/PermissionOverview_entity/PermissionOverview_entity.aod @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4"> <name>PermissionOverview_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> + <title>Permission Overview</title> <iconIdProcess>%aditoprj%/entity/PermissionOverview_entity/iconIdProcess.js</iconIdProcess> <recordContainer>jDito</recordContainer> <entityFields> diff --git a/entity/PermissionSet_entity/PermissionSet_entity.aod b/entity/PermissionSet_entity/PermissionSet_entity.aod index de974d459667407eeeade59ee3a5bafc1033aa77..1a764046c8ce84cb2a8d11618517c899972ecf73 100644 --- a/entity/PermissionSet_entity/PermissionSet_entity.aod +++ b/entity/PermissionSet_entity/PermissionSet_entity.aod @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4"> <name>PermissionSet_entity</name> - <title>Permission Set</title> <majorModelMode>DISTRIBUTED</majorModelMode> + <title>Permission Set</title> + <contentTitleProcess>%aditoprj%/entity/PermissionSet_entity/contentTitleProcess.js</contentTitleProcess> <iconId>VAADIN:SHIELD</iconId> - <titleProcess>%aditoprj%/entity/PermissionSet_entity/titleProcess.js</titleProcess> <recordContainer>db</recordContainer> <entityFields> <entityProvider> diff --git a/entity/PermissionSet_entity/titleProcess.js b/entity/PermissionSet_entity/contentTitleProcess.js similarity index 100% rename from entity/PermissionSet_entity/titleProcess.js rename to entity/PermissionSet_entity/contentTitleProcess.js diff --git a/entity/Permission_entity/Permission_entity.aod b/entity/Permission_entity/Permission_entity.aod index d3fdc6c6a461e2ceaea624da508ede85abee9add..662f10fbb475ee10bb4f64caed0d03506d5d4bc4 100644 --- a/entity/Permission_entity/Permission_entity.aod +++ b/entity/Permission_entity/Permission_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4"> <name>Permission_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> <iconId>VAADIN:SHIELD</iconId> diff --git a/entity/Role_entity/Role_entity.aod b/entity/Role_entity/Role_entity.aod index bcdfece711c16a2bfbfac39ba3f3fff491a2066e..9bdf9796688d13d9edb05762246dc22c38e64757 100644 --- a/entity/Role_entity/Role_entity.aod +++ b/entity/Role_entity/Role_entity.aod @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4"> <name>Role_entity</name> - <title>Roles</title> <majorModelMode>DISTRIBUTED</majorModelMode> <icon>VAADIN:USER_CHECK</icon> + <title>Roles</title> + <contentTitleProcess>%aditoprj%/entity/Role_entity/contentTitleProcess.js</contentTitleProcess> <iconId>VAADIN:USER_CHECK</iconId> - <titleProcess>%aditoprj%/entity/Role_entity/titleProcess.js</titleProcess> <recordContainer>jDito</recordContainer> <entityFields> <entityProvider> @@ -31,7 +31,6 @@ </entityField> <entityConsumer> <name>Permissions</name> - <title>Permission Detail</title> <fieldType>DEPENDENCY_OUT</fieldType> <dependency> <name>dependency</name> @@ -47,7 +46,6 @@ </entityConsumer> <entityConsumer> <name>PermissionOverviews</name> - <title>Permission Overview</title> <fieldType>DEPENDENCY_OUT</fieldType> <dependency> <name>dependency</name> diff --git a/entity/Role_entity/titleProcess.js b/entity/Role_entity/contentTitleProcess.js similarity index 100% rename from entity/Role_entity/titleProcess.js rename to entity/Role_entity/contentTitleProcess.js diff --git a/neonView/PermissionOverviewFilter_view/PermissionOverviewFilter_view.aod b/neonView/PermissionOverviewFilter_view/PermissionOverviewFilter_view.aod index 6de32f41d09867ba3ebc1aac04942ebedcdc5b66..456775fc326f8a86aa8b75b67e3b1e01bde00649 100644 --- a/neonView/PermissionOverviewFilter_view/PermissionOverviewFilter_view.aod +++ b/neonView/PermissionOverviewFilter_view/PermissionOverviewFilter_view.aod @@ -12,37 +12,34 @@ <children> <tableViewTemplate> <name>Table</name> - <hideActions v="true" /> <entityField>#ENTITY</entityField> <columns> <neonTableColumn> - <name>d243e0d8-10ff-435a-9245-38d873557150</name> + <name>2d83af69-cafe-471c-92de-0e6e66ba51aa</name> <entityField>#ICON</entityField> </neonTableColumn> <neonTableColumn> - <name>f47e1e21-d0fa-4102-a5f3-2f3281ecd5c0</name> + <name>16c4d649-ec91-415d-9768-78d0581ad44a</name> <entityField>ENTITY</entityField> </neonTableColumn> <neonTableColumn> - <name>bb518bdd-3a6c-4761-9d3c-ecedc331c6b4</name> + <name>f3e96f53-fb65-4b98-a189-cead544c17d8</name> <entityField>ACTION_VIEW</entityField> - <width v="75" /> - <expandRatio v="100" /> </neonTableColumn> <neonTableColumn> - <name>9f01ee57-d226-40f4-9f33-2816127e5d8c</name> + <name>d21161a7-51e8-4c83-9c92-b6a0d24ddc62</name> <entityField>ACTION_CREATE</entityField> </neonTableColumn> <neonTableColumn> - <name>bd0a77cd-de29-4245-812e-568346d6a1c3</name> + <name>c5679586-7f99-4ea5-99f4-94422e70c999</name> <entityField>ACTION_READ</entityField> </neonTableColumn> <neonTableColumn> - <name>ce935da4-f288-4649-9f87-025b631016f0</name> + <name>0699fd7b-d4ac-4ef8-ac19-1cd249ce3251</name> <entityField>ACTION_EDIT</entityField> </neonTableColumn> <neonTableColumn> - <name>b4249ba5-ed1e-4d48-80d0-c295d6d2e6fc</name> + <name>f7c3479e-e635-44f1-afc0-45570c4fffe9</name> <entityField>ACTION_DELETE</entityField> </neonTableColumn> </columns>