Skip to content
Snippets Groups Projects
Commit 36be8988 authored by Markus Escher's avatar Markus Escher
Browse files

Merge remote-tracking branch 'origin/master'

parents d84b48da 62c6f717
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 112 additions and 14 deletions
.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notificationcontents.xml → .liquibase/Data_alias/basic/2019.1.4/alter_appointmentlink.xml
+ 21
− 0
View file @ 36be8988
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="a.schindlbeck" id="6b25f062-fb39-4230-9348-b67ec5ec45a1">
<createTable tableName="ASYS_NOTIFICATIONCONTENTS">
<column name="CONTENTID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_ASYS_NOTIFICATIONCONTENTS_CONTENTID"/>
</column>
<column name="BACKPACK" type="CLOB"/>
<column name="CAPTION" type="VARCHAR(512)"/>
<column name="CREATIONDATE" type="BIGINT"/>
<column name="DESCRIPTION" type="VARCHAR(1023)"/>
<column name="FORCEDPRIORITY" type="INTEGER"/>
<column name="ICON_INFO" type="VARCHAR(1023)"/>
<column name="LIFETIME" type="BIGINT"/>
<column name="LINK_INFO" type="VARCHAR(1023)"/>
<column name="ORIGINATORNAME" type="VARCHAR(63)"/>
<column name="RECIPIENTUSERIDS" type="CLOB"/>
<column name="TYPECODE" type="VARCHAR(63)"/>
<column name="VERSION" type="INTEGER"/>
</createTable>
</changeSet>
<changeSet author="a.schindlbeck" id="7d7de9e8-054a-49b0-986d-ae3a273aed39">
<!-- Need to drop table and create new on, because columntypes can't be altered -->
<dropTable tableName="AB_APPOINTMENTLINK"/>
<createTable tableName="AB_APPOINTMENTLINK">
<column name="AB_APPOINTMENTLINK_ID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_AB_APPOINTMENTLINK_AB_APPOINTMENTLINKID"/>
</column>
<column name="APPOINTMENT_ID" type="VARCHAR(512)">
<constraints nullable="false"/>
</column>
<column name="OBJECT_TYPE" type="VARCHAR(63)">
<constraints nullable="false"/>
</column>
<column name="OBJECT_ROWID" type="VARCHAR(512)">
<constraints nullable="false"/>
</column>
</createTable>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2019.1.4/changelog.xml
+ 1
− 3
View file @ 36be8988
......@@ -161,7 +161,6 @@
<include relativeToChangelogFile="true" file="DSGVO/init_dsgvoType_keyword.xml"/>
<include relativeToChangelogFile="true" file="DSGVO/init_deadline_keyword.xml"/>
<include relativeToChangelogFile="true" file="DSGVO/init_transmission_keyword.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_UnlinkedMail.xml"/>
<include relativeToChangelogFile="true" file="Attributes/AB_ATTRIBUTE.xml"/>
......@@ -175,7 +174,6 @@
<include relativeToChangelogFile="true" file="Salesproject_Phase_icons.xml"/>
<include relativeToChangelogFile="true" file="Salesprojectmilestone_add_parent.xml"/>
<include relativeToChangelogFile="true" file="Salesproject_Phase_LongNames.xml"/>
<include relativeToChangelogFile="true" file="alter_appointmentlink.xml"/>
</databaseChangeLog>
entity/Address_entity/Address_entity.aod
+ 5
− 0
View file @ 36be8988
......@@ -399,6 +399,11 @@
</entityParameter>
</children>
</entityConsumer>
<entityParameter>
<name>ShowDsgvoMessage_param</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/showdsgvomessage_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/Address_entity/entityfields/showdsgvomessage_param/valueProcess.js 0 → 100644
+ 3
− 0
View file @ 36be8988
import("system.result");
result.string(false);
\ No newline at end of file
entity/Address_entity/recordcontainers/db/onDBInsert.js
+ 1
− 1
View file @ 36be8988
......@@ -12,4 +12,4 @@ else if (typeParam === "organisation")
new StandardObject("Address", vars.get("$field.ADDRESSID"), scopeType, vars.get("$field.CONTACT_ID"))
.onObjectInsert()
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(vars.get("$field.CONTACT_ID"), vars.get("$param.ShowDsgvoMessage_param"));
\ No newline at end of file
entity/Address_entity/recordcontainers/db/onDBUpdate.js
+ 1
− 1
View file @ 36be8988
import("system.vars");
import("DataPrivacy_lib");
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(vars.get("$field.CONTACT_ID"), vars.get("$param.ShowDsgvoMessage_param"));
\ No newline at end of file
entity/Appointment_entity/Appointment_entity.aod
+ 2
− 0
View file @ 36be8988
......@@ -81,6 +81,7 @@
</entityField>
<entityActionGroup>
<name>PartStatActionGroup</name>
<stateProcess>%aditoprj%/entity/Appointment_entity/entityfields/partstatactiongroup/stateProcess.js</stateProcess>
<children>
<entityActionField>
<name>accept</name>
......@@ -181,6 +182,7 @@
<title>Delete recurring appointment</title>
<onActionProcess>%aditoprj%/entity/Appointment_entity/entityfields/deleteseries/onActionProcess.js</onActionProcess>
<iconId>VAADIN:TRASH</iconId>
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/Appointment_entity/entityfields/deleteseries/stateProcess.js</stateProcess>
<tooltip>series delete action</tooltip>
</entityActionField>
......
entity/Appointment_entity/entityfields/deleteseries/stateProcess.js
+ 13
− 5
View file @ 36be8988
import("system.logging");
import("system.tools");
import("system.vars");
import("system.result");
import("system.calendars");
import("system.neon");
import("system.text");
var event = JSON.parse(vars.getString("$param.Entry_param"));
if(event != undefined && event != "") //event not empty
if(event[calendars.RECURRENCEID] != undefined && event[calendars.RECURRENCEID] != "") //event recurring appointment
if(event[calendars.ORGANIZER] == tools.getCurrentUser()["title"]) //user == organizer
result.object(neon.COMPONENTSTATE_EDITABLE);
if(event) //event not empty
{
var ownerCn = event[calendars.USER2]["cn"];
var currentUserTitle = vars.getString("$sys.user");
if(event[calendars.RECURRENCEID] && ownerCn == currentUserTitle) //serientermin und currentUser der TerminOwner
result.object(neon.COMPONENTSTATE_AUTO);
else
result.object(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
result.object(neon.COMPONENTSTATE_INVISIBLE);
}
else
result.object(neon.COMPONENTSTATE_AUTO);
\ No newline at end of file
entity/Appointment_entity/entityfields/partstatactiongroup/stateProcess.js 0 → 100644
+ 23
− 0
View file @ 36be8988
import("system.calendars");
import("system.logging");
import("system.result");
import("system.vars");
import("system.tools");
import("system.neon");
if(vars.getString("$param.Entry_param"))
{
var event = JSON.parse(vars.getString("$param.Entry_param"));
var ownerCn = event[calendars.USER2]["cn"];
var currentUserTitle = vars.getString("$sys.user");
if(!(event[calendars.ORGANIZER] == currentUserTitle) && currentUserTitle == ownerCn)
result.object(neon.COMPONENTSTATE_AUTO);
else
result.object(neon.COMPONENTSTATE_INVISIBLE);
}
else
{
result.object(neon.COMPONENTSTATE_AUTO);
}
\ No newline at end of file
entity/AttributeRelation_entity/AttributeRelation_entity.aod
+ 5
− 0
View file @ 36be8988
......@@ -248,6 +248,11 @@
<expose v="true" />
<documentation>%aditoprj%/entity/AttributeRelation_entity/entityfields/showempty_param/documentation.adoc</documentation>
</entityParameter>
<entityParameter>
<name>ShowDsgvoMessage_param</name>
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/showdsgvomessage_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
......
entity/AttributeRelation_entity/entityfields/showdsgvomessage_param/valueProcess.js 0 → 100644
+ 3
− 0
View file @ 36be8988
import("system.result");
result.string(false);
\ No newline at end of file
entity/AttributeRelation_entity/recordcontainers/jdito/onInsert.js
+ 1
− 1
View file @ 36be8988
......@@ -33,4 +33,4 @@ if (valueField)
db.insertData("AB_ATTRIBUTERELATION", columns, null, values);
if (vars.get("$param.ObjectType_param") == "Person")
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(vars.get("$param.ObjectRowId_param"));
\ No newline at end of file
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(vars.get("$param.ObjectRowId_param"), vars.get("$param.ShowDsgvoMessage_param"));
\ No newline at end of file
entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js
+ 1
− 1
View file @ 36be8988
......@@ -63,4 +63,4 @@ else
}
if (vars.get("$param.ObjectType_param") == "Person")
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(vars.get("$param.ObjectRowId_param"));
\ No newline at end of file
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(vars.get("$param.ObjectRowId_param"), vars.get("$param.ShowDsgvoMessage_param"));
\ No newline at end of file
entity/Communication_entity/Communication_entity.aod
+ 5
− 0
View file @ 36be8988
......@@ -215,6 +215,11 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>DATE_EDIT</name>
<valueProcess>%aditoprj%/entity/Communication_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>ShowDsgvoMessage_param</name>
<valueProcess>%aditoprj%/entity/Communication_entity/entityfields/showdsgvomessage_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/Communication_entity/entityfields/showdsgvomessage_param/valueProcess.js 0 → 100644
+ 3
− 0
View file @ 36be8988
import("system.result");
result.string(false);
\ No newline at end of file
entity/Communication_entity/recordcontainers/db/onDBInsert.js
+ 1
− 1
View file @ 36be8988
......@@ -5,4 +5,4 @@ import("StandardObject_lib");
new StandardObject("Communication", vars.get("$field.COMMUNICATIONID"), "Person", vars.get("$field.CONTACT_ID"))
.onCommunicationInsert(vars.get("$field.MEDIUM_ID"));
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(vars.get("$field.CONTACT_ID"), vars.get("$param.ShowDsgvoMessage_param"));
\ No newline at end of file
entity/Communication_entity/recordcontainers/db/onDBUpdate.js
+ 1
− 1
View file @ 36be8988
......@@ -5,4 +5,4 @@ import("StandardObject_lib");
new StandardObject("Communication", vars.get("$field.COMMUNICATIONID"), "Person", vars.get("$field.CONTACT_ID"))
.onCommunicationUpdate(vars.get("$field.MEDIUM_ID"));
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(vars.get("$field.CONTACT_ID"), vars.get("$param.ShowDsgvoMessage_param"));
\ No newline at end of file
entity/Person_entity/Person_entity.aod
+ 12
− 0
View file @ 36be8988
......@@ -169,6 +169,10 @@
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/persaddresses/children/contactid_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
<entityParameter>
<name>ShowDsgvoMessage_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/persaddresses/children/showdsgvomessage_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
......@@ -186,6 +190,10 @@
<description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
<entityParameter>
<name>ShowDsgvoMessage_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/communications/children/showdsgvomessage_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
......@@ -514,6 +522,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ShowDsgvoMessage_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/attributes/children/showdsgvomessage_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
......
entity/Person_entity/entityfields/attributes/children/showdsgvomessage_param/valueProcess.js 0 → 100644
+ 5
− 0
View file @ 36be8988
import("system.vars");
import("system.neon");
import("system.result");
result.string(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW);
\ No newline at end of file
entity/Person_entity/entityfields/communications/children/showdsgvomessage_param/valueProcess.js 0 → 100644
+ 5
− 0
View file @ 36be8988
import("system.vars");
import("system.neon");
import("system.result");
result.string(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW);
\ No newline at end of file
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