Skip to content
Snippets Groups Projects
Commit 335e1c57 authored by S.Listl's avatar S.Listl
Browse files

merge

parent 78c52228
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 257 deletions
entity/AttributeRelation_entity/AttributeRelation_entity.aod
+ 1
− 5
View file @ 335e1c57
......@@ -2,11 +2,7 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
<name>AttributeRelation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<titlePlural>Attributes</ti<grantDeleteProcess>%aditoprj%/entity/AttributeRelation_entity/grantDeleteProcess.js</grantDeleteProcess>
tlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
<grantDeleteProcess>%aditoprj%/entity/AttributeRelation_entity/grantDeleteProcess.js</grantDeleteProcess>
<titlePlural>Attributes</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
......
entity/SerialLetter_entity/SerialLetter_entity.aod
+ 0
− 60
View file @ 335e1c57
......@@ -117,63 +117,3 @@
</dbRecordContainer>
</recordContainers>
</entity>
<name>bc81b1c3-ce99-4581-ac70-4e24bebb0c75</name>
<tableName>DOCUMENTTEMPLATE</tableName>
<primaryKey>DOCUMENTTEMPLATEID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DOCUMENTTEMPLATE_ID.value</name>
<recordfield>SERIALLETTER.DOCUMENTTEMPLATE_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SERIALLETTERID.value</name>
<recordfield>SERIALLETTER.SERIALLETTERID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/SerialLetter_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<linkInformation>
<linkInformation>
<name>5d9c983a-b129-437a-ae9d-203fb8ad03ec</name>
<tableName>SERIALLETTER</tableName>
<primaryKey>SERIALLETTERID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
<name>bc81b1c3-ce99-4581-ac70-4e24bebb0c75</name>
<tableName>DOCUMENTTEMPLATE</tableName>
<primaryKey>DOCUMENTTEMPLATEID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DOCUMENTTEMPLATE_ID.value</name>
<recordfield>SERIALLETTER.DOCUMENTTEMPLATE_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SERIALLETTERID.value</name>
<recordfield>SERIALLETTER.SERIALLETTERID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DOCUMENTTEMPLATE_ID.displayValue</name>
<recordfield>DOCUMENTTEMPLATE.NAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TITLE.value</name>
<recordfield>SERIALLETTER.TITLE</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
</entity>
entity/targetId/entityfields/role/displayValueProcess.js deleted 100644 → 0
+ 0
− 10
View file @ 78c52228
import("system.result");
import("system.vars");
import("system.tools");
var allRoles = tools.getAllRoles();
var roleTitle = vars.get("$this.value");
if (roleTitle in allRoles)
roleTitle = allRoles[roleTitle][0];
result.string(roleTitle);
\ No newline at end of file
entity/targetId/entityfields/roles/children/excluderoles_param/valueProcess.js deleted 100644 → 0
+ 0
− 3
View file @ 78c52228
import("system.result");
result.string(JSON.stringify(["INTERNAL_EVERYONE", "INTERNAL_GROUPWARE", "INTERNAL_SNMP", "INTERNAL_DESIGNER", "INTERNAL_TECHNICAL"]));
\ No newline at end of file
entity/targetId/recordcontainers/jdito/contentProcess.js deleted 100644 → 0
+ 0
− 24
View file @ 78c52228
import("system.result");
import("system.vars");
import("system.tools");
var roles = [];
var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
var allRoles = tools.getAllRoles();
if (userTitle && tools.existUsers(userTitle))
{
var existsObj = {};
tools.getRoles(userTitle).forEach(function (role)
{
if (!this[role] && role != "INTERNAL_EVERYONE")
{
var roleTitle = role;
if (role in allRoles)
roleTitle = allRoles[role][0];
roles.push([role, role, roleTitle]);
this[role] = true;
}
}, existsObj);
}
result.object(roles);
\ No newline at end of file
entity/targetId/recordcontainers/jdito/onDelete.js deleted 100644 → 0
+ 0
− 19
View file @ 78c52228
import("system.result");
import("system.vars");
import("system.tools");
var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
var role = vars.get("$local.uid");
if (userTitle)
{
var user = tools.getUser(userTitle);
var roles = tools.getRoles(userTitle);
roles = roles.filter(function (row)
{
return row != role;
});
user[tools.ROLES] = roles;
tools.updateUser(user);
}
\ No newline at end of file
entity/targetId/recordcontainers/jdito/onInsert.js deleted 100644 → 0
+ 0
− 23
View file @ 78c52228
import("system.result");
import("system.vars");
import("system.tools");
var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
var newRole = vars.get("$local.rowdata")["ROLE.value"];
if (userTitle && tools.existUsers(userTitle) && newRole != "INTERNAL_EVERYONE")
{
var user = tools.getUser(userTitle);
var roles = tools.getRoles(userTitle);
var roleObj = {};
roles = [newRole].concat(roles)
.filter(function (role)
{
var exists = role in this;
this[role] = true;
return !exists;
}, roleObj);
user[tools.ROLES] = roles;
tools.updateUser(user);
}
\ No newline at end of file
entity/targetId/recordcontainers/jdito/onUpdate.js deleted 100644 → 0
+ 0
− 25
View file @ 78c52228
import("system.result");
import("system.vars");
import("system.tools");
var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
var oldRole = vars.get("$local.uid");
var newRole = vars.get("$local.rowdata")["ROLE.value"];
if (userTitle && oldRole != newRole)
{
var user = tools.getUser(userTitle);
var roles = tools.getRoles(userTitle);
var roleObj = {};
roleObj[oldRole] = true;
roles = [newRole].concat(roles)
.filter(function (role)
{
var exists = role in roleObj;
roleObj[role] = true;
return !exists;
});
user[tools.ROLES] = roles;
tools.updateUser(user);
}
\ No newline at end of file
entity/targetId/targetId.aod deleted 100644 → 0
+ 0
− 88
View file @ 78c52228
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>EmployeeRole_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Role</title>
<titlePlural>Roles</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
<entityField>
<name>UID</name>
</entityField>
<entityParameter>
<name>UserTitle_param</name>
<expose v="true" />
<mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
<name>EmployeeRoles</name>
<dependencies>
<entityDependency>
<name>3bcec57a-7165-4773-9253-5ecab26ee3f4</name>
<entityName>Employee_entity</entityName>
<fieldName>EmployeeRoles</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>UserTitle_param</name>
<expose v="true" />
<mandatory v="true" />
</entityParameter>
</children>
</entityProvider>
<entityField>
<name>ROLE</name>
<title>Role</title>
<consumer>Roles</consumer>
<linkedContext>Role</linkedContext>
<displayValueProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/role/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>Roles</name>
<dependency>
<name>dependency</name>
<entityName>Role_entity</entityName>
<fieldName>FilteredRoles</fieldName>
</dependency>
<children>
<entityParameter>
<name>ExcludeRoles_param</name>
<valueProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>TARGETCONTEXT</name>
</entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
<onUpdate>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
<onDelete>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js</onDelete>
<recordFieldMappings>
<jDitoRecordFieldMapping>
<name>UID.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>ROLE.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>ROLE.displayValue</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>TARGETCONTEXT.value</name>
</jDitoRecordFieldMapping>
</recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
</entity>
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