Skip to content
Snippets Groups Projects
Commit ded86f37 authored by daniel's avatar daniel
Browse files

merged 2020.0 into 1043987-wrong-participant-couting

parents 1ffcd3ad f56ab008
No related branches found
No related tags found
No related merge requests found
......@@ -249,7 +249,7 @@
<insert tableName="ASYS_BINARIES">
<column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/6f1a18491d368b9b87091abcbcfcba15"/>
<column name="CONTAINERNAME" value="DOCUMENT"/>
<column name="DATASIZE" valueNumeric="37361"/>
<column name="DATASIZE" valueNumeric="37675"/>
<column name="DATE_EDIT" valueDate="2019-10-17T09:03:06"/>
<column name="DATE_NEW" valueDate="2019-10-17T09:03:06"/>
<column name="FILENAME" value="Geschaeftspapiere.odt"/>
......@@ -385,7 +385,7 @@
<insert tableName="ASYS_BINARIES">
<column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/0f474ccbf77d31f899cd5eab5f9a3c24"/>
<column name="CONTAINERNAME" value="DOCUMENT"/>
<column name="DATASIZE" valueNumeric="37251"/>
<column name="DATASIZE" valueNumeric="44736"/>
<column name="DATE_EDIT" valueDate="2019-10-17T09:03:19"/>
<column name="DATE_NEW" valueDate="2019-10-17T09:03:19"/>
<column name="FILENAME" value="Kostenübernahmeerklärung.odt"/>
......
import("system.tools");
import("system.vars");
import("system.result");
result.string(JSON.stringify(["INTERNAL_EVERYONE", "INTERNAL_GROUPWARE", "INTERNAL_SNMP", "INTERNAL_DESIGNER", "INTERNAL_TECHNICAL"]));
\ No newline at end of file
var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
var excludeRolesArray = ["INTERNAL_EVERYONE", "INTERNAL_GROUPWARE", "INTERNAL_SNMP", "INTERNAL_DESIGNER", "INTERNAL_TECHNICAL"];
var userRoles = tools.getRoles(userTitle);
for (i = 0; i < userRoles.length; i++) {
excludeRolesArray.push(userRoles[i]);
}
result.string(JSON.stringify(excludeRolesArray));
\ No newline at end of file
import("system.vars");
import("system.neon");
import("Workflow_lib");
import("system.result");
result.string(WorkflowUtils.engineIsEnabled()
? neon.COMPONENTSTATE_EDITABLE
? vars.get("$sys.datarowcount") > 0
? neon.COMPONENTSTATE_EDITABLE
: neon.COMPONENTSTATE_DISABLED
: neon.COMPONENTSTATE_INVISIBLE
);
\ No newline at end of file
......@@ -289,8 +289,8 @@
<dbRecordFieldMapping>
<name>CONTACT_ID.value</name>
<recordfield>PRODUCTPRICE.CONTACT_ID</recordfield>
<isFilterable v="true" />
<isLookupFilter v="true" />
<isFilterable v="false" />
<isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>VALID_FROM.value</name>
......
......@@ -35,14 +35,29 @@ ContextUtils.getCurrentContextId = function()
* Returns the title of the context
*
* @param {String} pContextId id of the context
* @param {boolean} [pTranslate=false] if the title should be translated
* @param {boolean} [pAutoTranslate=false] pass "true" if the title should be translated with the current locale
*
* @return {String} title of the context
*/
ContextUtils.getTitle = function(pContextId, pTranslate)
ContextUtils.getTitle = function(pContextId, pAutoTranslate)
{
var title = project.getDataModel(project.DATAMODEL_KIND_CONTEXT, pContextId)[1];
return pTranslate ? translate.text(title) : title;
var dataModel = project.getDataModel(project.DATAMODEL_KIND_CONTEXT, pContextId);
var title = dataModel[1];
return pAutoTranslate ? translate.text(title) : title;
}
/**
* Returns the translated title of the context
*
* @param {String} pContextId id of the context
* @param {String} [pLocale=null] the locale for the translation, e.g. "de_DE"
*
* @return {String} title of the context, translated to the given (or default) locale
*/
ContextUtils.getTranslatedTitle = function(pContextId, pLocale)
{
var title = ContextUtils.getTitle(pContextId, false);
return pLocale ? translate.text(title, pLocale) : translate.text(title);
}
/**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment