File tree Expand file tree Collapse file tree 1 file changed +16
-7
lines changed Expand file tree Collapse file tree 1 file changed +16
-7
lines changed Original file line number Diff line number Diff line change @@ -992,13 +992,22 @@ s-wf:UserTaskFormTemplate
992
992
try {
993
993
var isReworkTask = individual["v-wf:onWorkOrder"][0]["v-wf:forWorkItem"][0]["v-wf:forNetElement"][0].id == "s-wf:cr_rework";
994
994
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
+ }
1002
1011
} else {
1003
1012
$("#edit-StartForm", template).remove();
1004
1013
};
You can’t perform that action at this time.
0 commit comments