Skip to content
Snippets Groups Projects
Commit f19433d8 authored by Sebastian Pongratz's avatar Sebastian Pongratz :ping_pong:
Browse files

Merge branch '#1063579-Beobachtungen' into 'master' 

#1063579 beobachtungen

See merge request xrm/basic!563
parents 958b96e9 6a4263a6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 113 additions and 3 deletions
entity/Employee_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js 0 → 100644
+ 5
− 0
View file @ f19433d8
import("system.result");
import("system.vars");
import("Observation_lib");
result.string(Observation.cancelActionTitle(vars.get("$sys.selection")));
\ No newline at end of file
entity/Employee_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js 0 → 100644
+ 3
− 0
View file @ f19433d8
import("Observation_lib");
Observation.insertAction();
\ No newline at end of file
entity/Employee_entity/entityfields/observeactiongroup/children/observe/stateProcess.js 0 → 100644
+ 8
− 0
View file @ f19433d8
import("system.result");
import("Observation_lib");
import("system.neon");
if (!Observation.countObservations())
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Employee_entity/entityfields/observeactiongroup/children/observe/titleProcess.js 0 → 100644
+ 5
− 0
View file @ f19433d8
import("system.result");
import("Observation_lib");
import("system.vars");
result.string(Observation.observeActionTitle(vars.get("$sys.selection")));
\ No newline at end of file
entity/KeywordEntry_entity/KeywordEntry_entity.aod
+ 6
− 0
View file @ f19433d8
......@@ -31,6 +31,12 @@
<fieldName>PrioKeywords</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>01b9bba5-3b65-4db0-b466-1e41061feb1a</name>
<entityName>Observation_entity</entityName>
<fieldName>PrioKeywords</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityField>
......
entity/Leadimport_entity/Leadimport_entity.aod
+ 21
− 0
View file @ f19433d8
......@@ -16,6 +16,27 @@
<titlePlural>Lead Imports</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityActionGroup>
<name>observeActionGroup</name>
<children>
<entityActionField>
<name>observe</name>
<title>Observe</title>
<onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
<isObjectAction v="true" />
<iconId>VAADIN:EYE</iconId>
<stateProcess>%aditoprj%/entity/Leadimport_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Leadimport_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
</entityActionField>
<entityActionField>
<name>cancelObservation</name>
<onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
<iconId>VAADIN:EYE_SLASH</iconId>
<stateProcess>%aditoprj%/entity/Leadimport_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Leadimport_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
</entityActionField>
</children>
</entityActionGroup>
<entityProvider>
<name>#PROVIDER</name>
<dependencies>
......
entity/Leadimport_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js 0 → 100644
+ 3
− 0
View file @ f19433d8
import("Observation_lib");
Observation.cancelAction();
\ No newline at end of file
entity/Leadimport_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js 0 → 100644
+ 8
− 0
View file @ f19433d8
import("system.result");
import("Observation_lib");
import("system.neon");
if (Observation.countObservations())
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Leadimport_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js 0 → 100644
+ 5
− 0
View file @ f19433d8
import("system.result");
import("system.vars");
import("Observation_lib");
result.string(Observation.cancelActionTitle(vars.get("$sys.selection")));
\ No newline at end of file
entity/Leadimport_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js 0 → 100644
+ 3
− 0
View file @ f19433d8
import("Observation_lib");
Observation.insertAction();
\ No newline at end of file
entity/Leadimport_entity/entityfields/observeactiongroup/children/observe/stateProcess.js 0 → 100644
+ 8
− 0
View file @ f19433d8
import("system.result");
import("Observation_lib");
import("system.neon");
if (!Observation.countObservations())
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Leadimport_entity/entityfields/observeactiongroup/children/observe/titleProcess.js 0 → 100644
+ 5
− 0
View file @ f19433d8
import("system.result");
import("Observation_lib");
import("system.vars");
result.string(Observation.observeActionTitle(vars.get("$sys.selection")));
\ No newline at end of file
entity/Leadimport_entity/recordcontainers/db/onDBDelete.js
+ 4
− 1
View file @ f19433d8
import("Workflow_lib");
import("Context_lib");
import("Sql_lib");
import("system.vars");
......@@ -37,4 +38,6 @@ binMetadata.forEach(function(pMeta)
});
new AttributeRelationQuery(leadImportId, null, ContextUtils.getCurrentContextId())
.deleteAllAttributes();
\ No newline at end of file
.deleteAllAttributes();
WorkflowSignalSender.deleted();
\ No newline at end of file
entity/Leadimport_entity/recordcontainers/db/onDBInsert.js
+ 3
− 1
View file @ f19433d8
import("Workflow_lib");
import("ExportTemplate_lib");
import("Sql_lib");
import("KeywordRegistry_basic");
......@@ -25,4 +26,5 @@ if(bindata != '' && filename != '')
var documentId = SingleBinaryUtils.insertMainDocument("LEADIMPORT", "IMPORTFILE", assignmentRowId, bindata, filename, "", SqlUtils.getBinariesAlias());
LeadImportUtils.loadImportFile(documentId, fieldSep, fieldLimit, recordSep, assignmentRowId, false, true);
}
}
\ No newline at end of file
}
WorkflowSignalSender.inserted();
\ No newline at end of file
entity/Leadimport_entity/recordcontainers/db/onDBUpdate.js
+ 3
− 0
View file @ f19433d8
import("Workflow_lib");
import("ExportTemplate_lib");
import("system.neon");
import("Sql_lib");
......@@ -42,3 +43,5 @@ if (vars.get("$field.bindata") != "FILE NOT CHANGED")
neon.refreshAll();
}
WorkflowSignalSender.updated();
entity/ObjectProxy_entity/ObjectProxy_entity.aod
+ 6
− 0
View file @ f19433d8
......@@ -32,6 +32,12 @@
<fieldName>LinkedObject</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>ccc805b6-14ea-457c-956d-8c025e178936</name>
<entityName>Observation_entity</entityName>
<fieldName>ObjectProxyConsumer</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>9d75842d-0f91-4ddf-bd94-d8f092f17224</name>
<entityName>KnowledgeLink_entity</entityName>
......
entity/ObjectTree_entity/ObjectTree_entity.aod
+ 1
− 0
View file @ f19433d8
......@@ -7,6 +7,7 @@
<grantUpdate v="true" />
<grantUpdateProcess>%aditoprj%/entity/ObjectTree_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/ObjectTree_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/ObjectTree_entity/contentTitleProcess.js</contentTitleProcess>
<titlePlural>Relations</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
......
entity/ObjectTree_entity/contentTitleProcess.js 0 → 100644
+ 4
− 0
View file @ f19433d8
import("system.vars");
import("system.result");
result.string(vars.get("$field.TITLE"));
\ No newline at end of file
entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+ 8
− 0
View file @ f19433d8
......@@ -84,6 +84,14 @@ else
_loadObjectRelationTree.call(tree, originalObjectIds[i], originalObjectTypes[i], selectedRelationType);
}
}
else if (!vars.exists("$param.ObjectIds_param") && uidParam)
{
newSelect("OBJECT" + (pObjectRelationId ? myNum : otherNum) + "_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE, INFO, AB_OBJECTRELATIONTYPEID")
.from("AB_OBJECTRELATION")
.join("AB_OBJECTRELATIONTYPE", onConditionForRelationTypeJoin)
.whereIfSet("AB_OBJECTRELATION.AB_OBJECTRELATIONID", pObjectRelationId || null) // set id to null, as only null works with .andIfSet
.table();
}
if (uidParam) //workaround!
tree = tree.filter(function (row) {return JSON.parse(row[0])[UID.objectRelationId] == uidParam});
}
......
entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js
+ 4
− 1
View file @ f19433d8
import("Workflow_lib");
import("system.vars");
import("Sql_lib");
var objectRelationId = vars.get("$local.rowdata")["OBJECTRELATIONID.value"];
newWhereIfSet("AB_OBJECTRELATION.AB_OBJECTRELATIONID", objectRelationId).deleteData();
\ No newline at end of file
newWhereIfSet("AB_OBJECTRELATION.AB_OBJECTRELATIONID", objectRelationId).deleteData();
WorkflowSignalSender.deleted();
\ 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