diff --git a/entity/DSGVO_entity/DSGVO_entity.aod b/entity/DSGVO_entity/DSGVO_entity.aod index fbaf3f7ff25488adf16b2493b47c3b15fdf7e07a..4419339c1c80bc55a24c765690d4308ac38ca4a1 100644 --- a/entity/DSGVO_entity/DSGVO_entity.aod +++ b/entity/DSGVO_entity/DSGVO_entity.aod @@ -12,7 +12,7 @@ </siblings> <grantCreate v="false" /> <grantDelete v="false" /> - <titlePlural>Data privacy entries</titlePlural> + <titlePlural></titlePlural> <recordContainer>jdito</recordContainer> <entityFields> <entityProvider> diff --git a/neonContext/Person/Person.aod b/neonContext/Person/Person.aod index 7149d8ce16047f3b015929edca81b215ba0949e4..814818bacfb89505c438381811ca595b54957bd3 100644 --- a/neonContext/Person/Person.aod +++ b/neonContext/Person/Person.aod @@ -48,7 +48,11 @@ </neonViewReference> <neonViewReference> <name>296af7da-1994-49a3-a26f-903f29609fae</name> - <view>PersonDSGVORestriction_view</view> + <view>PersonAttributeRestriction_view</view> + </neonViewReference> + <neonViewReference> + <name>c91a69c4-8699-4117-9154-cb6be65f6a69</name> + <view>PersonDataPrivacy_view</view> </neonViewReference> </references> </neonContext> diff --git a/neonView/DSGVOFilter_view/DSGVOFilter_view.aod b/neonView/DSGVOFilter_view/DSGVOFilter_view.aod index cbf7906a101dc094904b7b1d329b97a78491062e..5fe12702f18648d0d080c348df3a47508e37b3c5 100644 --- a/neonView/DSGVOFilter_view/DSGVOFilter_view.aod +++ b/neonView/DSGVOFilter_view/DSGVOFilter_view.aod @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1"> <name>DSGVOFilter_view</name> + <title>Data Privacy</title> <majorModelMode>DISTRIBUTED</majorModelMode> <filterable v="true" /> <layout> diff --git a/neonView/PersonDSGVORestriction_view/PersonDSGVORestriction_view.aod b/neonView/PersonAttributeRestriction_view/PersonAttributeRestriction_view.aod similarity index 73% rename from neonView/PersonDSGVORestriction_view/PersonDSGVORestriction_view.aod rename to neonView/PersonAttributeRestriction_view/PersonAttributeRestriction_view.aod index ba8c4846f3577209970fff50c6cc87e9984d3d11..010c966291b9fa6a9e5b869b247f348f36b6b071 100644 --- a/neonView/PersonDSGVORestriction_view/PersonDSGVORestriction_view.aod +++ b/neonView/PersonAttributeRestriction_view/PersonAttributeRestriction_view.aod @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1"> - <name>PersonDSGVORestriction_view</name> - <title>Data Privacy</title> + <name>PersonAttributeRestriction_view</name> + <title>Attributes</title> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> <boxLayout> @@ -10,9 +10,9 @@ </layout> <children> <neonViewReference> - <name>e9af5716-946a-4d29-86e3-06c5231838f9</name> - <entityField>DSGVOEntries</entityField> - <view>DSGVODrawer_view</view> + <name>0398cc40-98f9-42a5-a2ed-938a5e8945e0</name> + <entityField>Attributes</entityField> + <view>AttributeRelationTree_view</view> </neonViewReference> <neonViewReference> <name>38199f7b-af85-4576-a6ee-3add0e6761aa</name> diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod index 8d0e2c2199b0a60ac43de76991b5ce64d84fa78f..af6be96b8f6e165ab32bc3741c312fcfe111eddb 100644 --- a/neonView/PersonMain_view/PersonMain_view.aod +++ b/neonView/PersonMain_view/PersonMain_view.aod @@ -40,14 +40,14 @@ <view>PersonTaskAppointment_view</view> </neonViewReference> <neonViewReference> - <name>c6dad062-2708-4329-bb60-90f8ab482a6c</name> - <entityField>#ENTITY</entityField> - <view>PersonDSGVORestriction_view</view> + <name>05846541-3e37-43f8-ab39-017b947d40dc</name> + <entityField>DSGVOEntries</entityField> + <view>DSGVOFilter_view</view> </neonViewReference> <neonViewReference> - <name>cf989bf6-3e49-44fc-ba98-322aae377da3</name> - <entityField>AttributeTree</entityField> - <view>AttributeRelationTree_view</view> + <name>0470a456-1132-4802-ba69-4a1b562b8f14</name> + <entityField>#ENTITY</entityField> + <view>PersonAttributeRestriction_view</view> </neonViewReference> <neonViewReference> <name>4b50b784-484f-4cdf-a705-4c356da763fa</name>