Skip to content

Commit 6c7833e

Browse files
committed
fix(ui): #edit-StartForm button now correct read startFormId-variable
1 parent 804c1ae commit 6c7833e

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

onto/common-lib-net.ttl

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -992,13 +992,22 @@ s-wf:UserTaskFormTemplate
992992
try {
993993
var isReworkTask = individual["v-wf:onWorkOrder"][0]["v-wf:forWorkItem"][0]["v-wf:forNetElement"][0].id == "s-wf:cr_rework";
994994
if (isReworkTask) {
995-
var variableArr = individual["v-wf:onWorkOrder"][0]["v-wf:forWorkItem"][0]["v-wf:forProcess"][0]["v-wf:inVars"];
996-
var startFormId = variableArr.filter(function(variable){
997-
return variable["v-wf:variableName"][0] == "startForm_id";
998-
})[0]["v-wf:variableValue"][0];
999-
$("#edit-StartForm", template).click(function(){
1000-
var modal = veda.Util.showModal(startFormId, new veda.IndividualModel("s-wf:ComplexRouteStartForm_Common_Template"), "view");
1001-
});
995+
var forProcess = individual["v-wf:onWorkOrder"][0]["v-wf:forWorkItem"][0]["v-wf:forProcess"][0];
996+
var startForm = forProcess.properties["v-wf:hasStartForm"];
997+
if (startForm) {
998+
startForm = startForm[0].data;
999+
} else {
1000+
//Устаревший вариант
1001+
var startFormVar = forProcess["v-wf:inVars"].filter(function (vrbl) {
1002+
return vrbl.hasValue("v-wf:variableName", "startForm_id");
1003+
});
1004+
startForm = startFormVar[0]["v-wf:variableValue"][0].id;
1005+
};
1006+
if (startForm) {
1007+
$("#edit-StartForm", template).click(function(){
1008+
var modal = veda.Util.showModal(new veda.IndividualModel(startForm), new veda.IndividualModel("s-wf:ComplexRouteStartForm_Common_Template"), "view");
1009+
});
1010+
}
10021011
} else {
10031012
$("#edit-StartForm", template).remove();
10041013
};

0 commit comments

Comments
 (0)