Skip to content
Snippets Groups Projects
Commit 24688570 authored by Andreas Schindlbeck's avatar Andreas Schindlbeck
Browse files

merge master

parent 09515ffd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 77 additions and 96 deletions
.aditoprj/project.version
+ 1
− 0
View file @ 24688570
#This file is generated by ADITO designer. Do NOT delete or modify!
#Wed Feb 06 07:12:44 CET 2019
version=5.1.8
entity/Contract_entity/Contract_entity.aod
+ 1
− 20
View file @ 24688570
......@@ -235,26 +235,6 @@
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>ObjectRelation_dfo</name>
<title>Relations</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>ObjectRelation_entity</entityName>
<fieldName>ByAnyObject_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>AnyObjectRowid_param</name>
<code>%aditoprj%/entity/Contract_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AnyObjectType_param</name>
<code>%aditoprj%/entity/Contract_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -374,3 +354,4 @@
</dbRecordContainer>
</recordContainers>
</entity>
entity/ObjectRelation_entity/ObjectRelation_entity.aod
+ 5
− 12
View file @ 24688570
......@@ -215,18 +215,6 @@
<fieldName>ObjectRelation_dfo</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>5c2e0fd4-8b64-46c7-afe1-fbb5fbbbedf8</name>
<entityName>Salesproject_entity</entityName>
<fieldName>ObjectRelation_dfo</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>e91667d7-9031-4c91-82af-5db255305793</name>
<entityName>Contract_entity</entityName>
<fieldName>ObjectRelation_dfo</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
......@@ -255,6 +243,10 @@
</entityParameter>
</children>
</entityProvider>
<name>test_dfi</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
</entityIncomingField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -320,3 +312,4 @@
</dbRecordContainer>
</recordContainers>
</entity>
neonView/AppointmentEdit_view/AppointmentEdit_view.aod
+ 39
− 35
View file @ 24688570
<?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>AppointmentEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<appointmentEditViewTemplate>
<name>AppointmentEditTemplate</name>
<summaryField>SUMMARY</summaryField>
<descriptionField>DESCRIPTION</descriptionField>
<beginField>BEGIN</beginField>
<endField>END</endField>
<attendeesField>ATTENDEES</attendeesField>
<privateField>CLASSIFICATION</privateField>
<statusField>STATUS</statusField>
<locationField>LOCATION</locationField>
<categoriesField>CATEGORIES</categoriesField>
<alldayField>ALLDAY</alldayField>
<transparencyField>TRANSPARENCY</transparencyField>
<organizerField>ORGANIZER</organizerField>
<favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
<rruleField>RRULE</rruleField>
<recurrenceIdField>RECURRENCEID</recurrenceIdField>
<saveScopeField>SAFESCOPEFIELD</saveScopeField>
<masterBeginField>MASTERBEGIN</masterBeginField>
<masterEndField>MASTEREND</masterEndField>
<reminderField>REMINDER</reminderField>
<entityField>#ENTITY</entityField>
</appointmentEditViewTemplate>
</children>
</neonView>
<?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>AppointmentEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<appointmentEditViewTemplate>
<name>AppointmentEditTemplate</name>
<summaryField>SUMMARY</summaryField>
<descriptionField>DESCRIPTION</descriptionField>
<beginField>BEGIN</beginField>
<endField>END</endField>
<attendeesField>ATTENDEES</attendeesField>
<privateField>CLASSIFICATION</privateField>
<statusField>STATUS</statusField>
<locationField>LOCATION</locationField>
<linksField>LINKS</linksField>
<categoriesField>CATEGORIES</categoriesField>
<alldayField>ALLDAY</alldayField>
<transparencyField>TRANSPARENCY</transparencyField>
<organizerField>ORGANIZER</organizerField>
<favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
<rruleField>RRULE</rruleField>
<recurrenceIdField>RECURRENCEID</recurrenceIdField>
<saveScopeField>SAFESCOPEFIELD</saveScopeField>
<masterBeginField>MASTERBEGIN</masterBeginField>
<masterEndField>MASTEREND</masterEndField>
<reminderField>REMINDER</reminderField>
<entityField>#ENTITY</entityField>
</appointmentEditViewTemplate>
<genericMultipleViewTemplate>
<name>GenericMultiple</name>
</genericMultipleViewTemplate>
</children>
</neonView>
neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+ 30
− 29
View file @ 24688570
<?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>AppointmentPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<appointmentPreviewViewTemplate>
<name>AppointmentPreviewTemplate</name>
<summaryField>SUMMARY</summaryField>
<descriptionField>DESCRIPTION</descriptionField>
<beginField>BEGIN</beginField>
<endField>END</endField>
<periodField>STARTEND</periodField>
<attendeesField>ATTENDEES</attendeesField>
<privateField>CLASSIFICATION</privateField>
<transparencyField>TRANSPARENCY</transparencyField>
<statusField>STATUS</statusField>
<locationField>LOCATION</locationField>
<organizerField>ORGANIZER</organizerField>
<categoriesField>CATEGORIES</categoriesField>
<favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
<entityField>#ENTITY</entityField>
</appointmentPreviewViewTemplate>
</children>
</neonView>
<?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>AppointmentPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<appointmentPreviewViewTemplate>
<name>AppointmentPreviewTemplate</name>
<summaryField>SUMMARY</summaryField>
<descriptionField>DESCRIPTION</descriptionField>
<beginField>BEGIN</beginField>
<endField>END</endField>
<periodField>STARTEND</periodField>
<attendeesField>ATTENDEES</attendeesField>
<privateField>CLASSIFICATION</privateField>
<transparencyField>TRANSPARENCY</transparencyField>
<statusField>STATUS</statusField>
<locationField>LOCATION</locationField>
<linkField>LINKS</linkField>
<organizerField>ORGANIZER</organizerField>
<categoriesField>CATEGORIES</categoriesField>
<favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
<entityField>#ENTITY</entityField>
</appointmentPreviewViewTemplate>
</children>
</neonView>
preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+ 1
− 0
View file @ 24688570
......@@ -30,3 +30,4 @@
<indexsearchIncrementingIndexerBunchSize v="250" />
<indexsearchMaximumHits v="50000" />
</preferences>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment