fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 10273 "No es posible navegar por todas las pestanias de..." SOLVED

Browse Source 
- Missing translation in "Assignment rules" (DESIGNER>Task>Properties)
- Added validation to prevent errors
* Available from version ProcessMaker-2.0.46
This commit is contained in:
Victor Saisa Lopez
2013-01-08 10:13:26 -04:00
parent 781e061942
commit 61328ced98
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/js/processmap/core/processes_Map.js
View File

@@ -77,7 +77,7 @@ var saveDataTaskTemporal = function(iForm)
{ {
oTaskData.TAS_ASSIGN_TYPE = 'SELF_SERVICE'; oTaskData.TAS_ASSIGN_TYPE = 'SELF_SERVICE';
} }
if (getField('TAS_ASSIGN_TYPE][SELF_SERVICE_EVALUATE').checked) if (getField("TAS_ASSIGN_TYPE][SELF_SERVICE_EVALUATE") && getField("TAS_ASSIGN_TYPE][SELF_SERVICE_EVALUATE").checked)
{ {
oTaskData.TAS_ASSIGN_TYPE = 'SELF_SERVICE_EVALUATE'; oTaskData.TAS_ASSIGN_TYPE = 'SELF_SERVICE_EVALUATE';
} }
@@ -371,3 +371,4 @@ var ofToAssignTrigger = function(sStep, sTrigger, sType, iPosition)
}.extend(this) }.extend(this)
}); });
}; };

26
workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml
View File

@@ -105,10 +105,12 @@ var showTextpm = function ()
} else */ } else */
if (getField("TAS_ASSIGN_TYPE][EVALUATE").checked == true) { if (getField("TAS_ASSIGN_TYPE][EVALUATE").checked == true) {
getField("TAS_SELFSERVICE_TIMEOUT").checked = false;
showRowById("TAS_ASSIGN_VARIABLE"); showRowById("TAS_ASSIGN_VARIABLE");
//getField("TAS_GROUP_VARIABLE").value = ""; //getField("TAS_GROUP_VARIABLE").value = "";
} else { } else {
if (getField("TAS_ASSIGN_TYPE][SELF_SERVICE_EVALUATE").checked) { if (getField("TAS_ASSIGN_TYPE][SELF_SERVICE_EVALUATE") && getField("TAS_ASSIGN_TYPE][SELF_SERVICE_EVALUATE").checked) {
showRowById("TAS_GROUP_VARIABLE"); showRowById("TAS_GROUP_VARIABLE");
showRowById("TAS_SELFSERVICE_TIMEOUT"); showRowById("TAS_SELFSERVICE_TIMEOUT");
@@ -123,6 +125,8 @@ var showTextpm = function ()
selfServiceTimeoutDataShow(getField("TAS_SELFSERVICE_TIMEOUT").checked); selfServiceTimeoutDataShow(getField("TAS_SELFSERVICE_TIMEOUT").checked);
} else { } else {
getField("TAS_SELFSERVICE_TIMEOUT").checked = false;
//getField("TAS_GROUP_VARIABLE").value = ""; //getField("TAS_GROUP_VARIABLE").value = "";
} }
} }
@@ -139,7 +143,9 @@ if (aTaskFlag[1])
if (oTaskData.TAS_ASSIGN_TYPE == "SELF_SERVICE") { if (oTaskData.TAS_ASSIGN_TYPE == "SELF_SERVICE") {
getField("TAS_ASSIGN_TYPE][SELF_SERVICE").checked = true; getField("TAS_ASSIGN_TYPE][SELF_SERVICE").checked = true;
} else { } else {
getField("TAS_ASSIGN_TYPE][SELF_SERVICE_EVALUATE").checked = true; if (getField("TAS_ASSIGN_TYPE][SELF_SERVICE_EVALUATE")) {
getField("TAS_ASSIGN_TYPE][SELF_SERVICE_EVALUATE").checked = true;
}
} }
getField("TAS_SELFSERVICE_TIMEOUT").checked = (oTaskData.TAS_SELFSERVICE_TIMEOUT == 1)? true : false; getField("TAS_SELFSERVICE_TIMEOUT").checked = (oTaskData.TAS_SELFSERVICE_TIMEOUT == 1)? true : false;
@@ -201,16 +207,20 @@ aTaskFlag[1] = true;
showTextpm(); showTextpm();
} }
leimnud.event.add(getField('TAS_ASSIGN_TYPE][SELF_SERVICE'), 'click', function() { leimnud.event.add(getField('TAS_ASSIGN_TYPE][SELF_SERVICE'), 'click', function() {
showTextpm(); showTextpm();
}); });
leimnud.event.add(getField('TAS_ASSIGN_TYPE][SELF_SERVICE_EVALUATE'), 'click', function() { if (getField("TAS_ASSIGN_TYPE][SELF_SERVICE_EVALUATE")) {
showTextpm(); leimnud.event.add(
}); getField("TAS_ASSIGN_TYPE][SELF_SERVICE_EVALUATE"),
"click",
function ()
{
showTextpm();
}
);
}
leimnud.event.add(getField('TAS_ASSIGN_TYPE][REPORT_TO'), 'click', function() { leimnud.event.add(getField('TAS_ASSIGN_TYPE][REPORT_TO'), 'click', function() {
showTextpm(); showTextpm();