Skip to content
Snippets Groups Projects
Commit ab794666 authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

Merge branch '#1056564-UpdateEmploeeAbteilung' into 'master' 

#1056564-UpdateEmploeeAbteilung

See merge request xrm/basic!190
parents dd439656 98dc2cb6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 50 additions and 3 deletions
.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Birgit_Leicht.xml
+ 8
− 0
View file @ ab794666
......@@ -109,6 +109,14 @@
<column name="PROPKEY" value="isActive"/>
<column name="PROPVAL" value="true"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="DATE_NEW" valueDate="2020-04-27T12:11:00.000"/>
<column name="GROUPID" value="NOGROUP"/>
<column name="ID" value="3c8e31a5-81c9-4cc3-895b-d5a8b5d87fa9"/>
<column name="NAME" value="_____USER_63529b4d-695d-45c0-907f-b3bd9d614115"/>
<column name="PROPKEY" value="department"/>
<column name="PROPVAL" value="e47c7fb1-1072-4f03-a275-e4b6331deec1"/>
</insert>
<rollback>
<delete tableName="ASYS_USERS">
<where>NAME = ?</where>
......
.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Harold_Smith.xml
+ 8
− 0
View file @ ab794666
......@@ -127,6 +127,14 @@
<column name="PROPKEY" value="isActive"/>
<column name="PROPVAL" value="true"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="DATE_NEW" valueDate="2020-04-27T12:11:00.000"/>
<column name="GROUPID" value="NOGROUP"/>
<column name="ID" value="fee8756b-7e97-4472-aa58-bb49d1ee7902"/>
<column name="NAME" value="_____USER_0555b87b-5708-4748-aa88-064e33cab002"/>
<column name="PROPKEY" value="department"/>
<column name="PROPVAL" value="c9d81109-4406-4205-8b90-e27acf587cf1"/>
</insert>
<rollback>
<delete tableName="ASYS_USERS">
<where>NAME = ?</where>
......
.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Herbert_Obermeier.xml
+ 8
− 0
View file @ ab794666
......@@ -109,6 +109,14 @@
<column name="PROPKEY" value="isActive"/>
<column name="PROPVAL" value="true"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="DATE_NEW" valueDate="2020-04-27T12:11:00.000"/>
<column name="GROUPID" value="NOGROUP"/>
<column name="ID" value="67de6be9-07e6-40c7-9e41-fc341081fbd5"/>
<column name="NAME" value="_____USER_c8625e26-1597-4ce9-9558-3fb787892e65"/>
<column name="PROPKEY" value="department"/>
<column name="PROPVAL" value="93de7e9f-3ecd-45e7-aafe-020ab5f3ee79"/>
</insert>
<rollback>
<delete tableName="ASYS_USERS">
<where>NAME = ?</where>
......
.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Lisa_Sommer.xml
+ 8
− 0
View file @ ab794666
......@@ -136,6 +136,14 @@
<column name="PROPKEY" value="isActive"/>
<column name="PROPVAL" value="true"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="DATE_NEW" valueDate="2020-04-27T12:11:00.000"/>
<column name="GROUPID" value="NOGROUP"/>
<column name="ID" value="b9418e4d-709a-40e0-9b2a-b3d864cd5adc"/>
<column name="NAME" value="_____USER_883d4192-8150-4d64-ad53-d2435c5d63e9"/>
<column name="PROPKEY" value="department"/>
<column name="PROPVAL" value="dc1427a9-056a-463a-a07f-f08f820fae0e"/>
</insert>
<rollback>
<delete tableName="ASYS_USERS">
<where>NAME = ?</where>
......
.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Susanne_Lustig.xml
+ 8
− 0
View file @ ab794666
......@@ -109,6 +109,14 @@
<column name="PROPKEY" value="isActive"/>
<column name="PROPVAL" value="true"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="DATE_NEW" valueDate="2020-04-27T12:11:00.000"/>
<column name="GROUPID" value="NOGROUP"/>
<column name="ID" value="02fb802c-446d-4446-98f1-0e865c0950a6"/>
<column name="NAME" value="_____USER_7c71ba90-f7a8-4e13-8cbe-e64730dc86ea"/>
<column name="PROPKEY" value="department"/>
<column name="PROPVAL" value="29e6ddbf-77fd-4fb2-ae20-fdad9495dbd5"/>
</insert>
<rollback>
<delete tableName="ASYS_USERS">
<where>NAME = ?</where>
......
.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/insert_asys_users-admin.xml
+ 8
− 0
View file @ ab794666
......@@ -226,6 +226,14 @@
<column name="PROPKEY" value="phoneAddress"/>
<column name="PROPVAL" value="PJSIP/212"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="DATE_NEW" valueDate="2020-04-27T12:11:00.000"/>
<column name="GROUPID" value="NOGROUP"/>
<column name="ID" value="c2eea117-30d7-46b8-bc12-1d3f0963dc55"/>
<column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
<column name="PROPKEY" value="department"/>
<column name="PROPVAL" value="29e6ddbf-77fd-4fb2-ae20-fdad9495dbd5"/>
</insert>
<rollback>
<delete tableName="ASYS_USERS">
<where>NAME = ?</where>
......
process/PermissionCalendar_lib/process.js
+ 2
− 3
View file @ ab794666
......@@ -169,8 +169,7 @@ PermissionCalendar.setPermissions = function(pUserId)
if(categories[key].writeable)
{
// With Write
calendars.setCalendarUser(res[key], calendars.RIGHT_WRITE_APPOINTMENT, false, calendars.SORTSTRATEGY_NATURAL);
calendars.addPermissions(res[key], calendars.VEVENT, ["READ"], categories[key].fields, false, calendars.SORTSTRATEGY_NATURAL);
calendars.addPermissions(res[key], calendars.VEVENT, ["READ", "WRITE"], categories[key].fields, false, calendars.SORTSTRATEGY_NATURAL);
}
else
{
......@@ -181,7 +180,7 @@ PermissionCalendar.setPermissions = function(pUserId)
}
}
// User itself can read and write his own calendar
calendars.setCalendarUser([EmployeeUtils.getCurrentUserName()], calendars.RIGHT_WRITE_APPOINTMENT | calendars.RIGHT_READ_APPOINTMENT, false, calendars.SORTSTRATEGY_NATURAL);
calendars.addPermissions([EmployeeUtils.getCurrentUserName()], calendars.VEVENT, ["READ", "WRITE"], categories["READWRITE"].fields , false, calendars.SORTSTRATEGY_NATURAL);
}
/**
......
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