Merge branch 'master' of gitlab.adito.de:xrm/basic

.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notificationcontents.xml → .liquibase/Data_alias/basic/2019.1.4/alter_appointmentlink.xml

 <?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

@@ -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/Appointment_entity/Appointment_entity.aod

@@ -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

+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

+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

neonView/DocumentFilter_view/DocumentFilter_view.aod

@@ -12,6 +12,10 @@
     <tableViewTemplate>
       <name>Documents</name>
       <favoriteActionGroup1>Document_actions</favoriteActionGroup1>
+      <iconField>PREVIEW_IMAGE</iconField>
+      <titleField>NAME</titleField>
+      <subtitleField>TYPE</subtitleField>
+      <descriptionField>SIZE</descriptionField>
       <entityField>#ENTITY</entityField>
       <columns>
         <neonTableColumn>