diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod index d2e1ef75a8f1596e6efed00651911617de158eed..cb46a825301f32476ff7d6e787daef5eb8105e35 100644 --- a/entity/Appointment_entity/Appointment_entity.aod +++ b/entity/Appointment_entity/Appointment_entity.aod @@ -119,12 +119,6 @@ <entityField> <name>ATTENDEESLENGTH</name> </entityField> - <entityField> - <name>LINKOBJECT</name> - <title>Linkobject</title> - <consumer>Objects</consumer> - <linkedContext>Object</linkedContext> - </entityField> <entityField> <name>ICON</name> </entityField> @@ -187,12 +181,6 @@ </entityParameter> </children> </entityConsumer> - <entityField> - <name>LINKTYPE</name> - <title>Linktype</title> - <consumer>Contexts</consumer> - <linkedContext>Context</linkedContext> - </entityField> </entityFields> <recordContainers> <jDitoRecordContainer> diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod index 7692f06dc4e5c53e9b9a9ba09eaf29c2d6e36c29..844a65942f92a6089f1c7a5197d1065a0a1311d1 100644 --- a/entity/Organisation_entity/Organisation_entity.aod +++ b/entity/Organisation_entity/Organisation_entity.aod @@ -405,6 +405,7 @@ <entityParameter> <name>objectRowId_param</name> <code>%aditoprj%/entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/code.js</code> + <expose v="true" /> <triggerRecalculation v="true" /> </entityParameter> <entityParameter> diff --git a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod index 68581d6336cf998f5963361f1f428d10b09a002b..81d642c40d54f51d68ef3246add18df5e97f9d6a 100644 --- a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod +++ b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod @@ -30,8 +30,6 @@ <masterBeginField>MASTERBEGIN</masterBeginField> <masterEndField>MASTEREND</masterEndField> <reminderField>REMINDER</reminderField> - <appointmentLinkField>LINKS</appointmentLinkField> - <appointmentLinkTypeField>LINKTYPE</appointmentLinkTypeField> <entityField>#ENTITY</entityField> </appointmentEditViewTemplate> <neonViewReference> diff --git a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod index 28572813858612fe1b31d76dffa1ec8adac5320b..0e6f03ca25af5f1f5f76bd87009bc68a788c48c1 100644 --- a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod +++ b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1"> <name>AppointmentLinkFilter_view</name> + <title>relations</title> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> <boxLayout> @@ -10,8 +11,10 @@ <children> <tableViewTemplate> <name>Links</name> + <showHeader v="true" /> <autoNewRow v="true" /> <entityField>#ENTITY</entityField> + <title>relations</title> <columns> <neonTableColumn> <name>17c0a8a9-354c-4095-a5d4-5c2613c897a3</name> diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod index 336d6b092bda8ab38166821c8d50c82ace586ceb..581c9d3a6896bb001678073f2ebc276b89dd4112 100644 --- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod +++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod @@ -10,11 +10,15 @@ <value></value> </entry> <entry> - <key>Privat</key> + <key>Organisation</key> <value></value> </entry> <entry> - <key>Organisation</key> + <key>auswärts</key> + <value></value> + </entry> + <entry> + <key>Urlaub</key> <value></value> </entry> </calendarCategoriesEvent>