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

Merged in luisfernandosl/processmaker/BUG-331 (pull request #861)

Browse Source 
BUG 331 "Web entry Testing Configuration..." SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2014-10-07 13:15:07 -04:00
parent 7faf0f1985 f05378aa10
commit 62be81333d
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
workflow/engine/xmlform/dynaforms/dynaforms_WebEntry.xml
View File

@@ -45,6 +45,7 @@
<js type="javascript"><![CDATA[ <js type="javascript"><![CDATA[
var oPanel1; var oPanel1;
getField('SEARCH').disabled = true; getField('SEARCH').disabled = true;
hideRowById("SEARCH");
//hideRowById('WS_USER'); //hideRowById('WS_USER');
//hideRowById('WS_PASS'); //hideRowById('WS_PASS');
@@ -60,6 +61,9 @@ leimnud.event.add(getField('TASKS'), 'change', function() {
/**/ /**/
leimnud.event.add(getField('WE_TYPE'), 'change', function() { leimnud.event.add(getField('WE_TYPE'), 'change', function() {
if (getField('WE_TYPE').value=='WS') { if (getField('WE_TYPE').value=='WS') {
hideRowById("SEARCH");
showRowById("TEST");
showRowById('WE_USR'); showRowById('WE_USR');
showRowById('WS_USER'); showRowById('WS_USER');
showRowById('WS_PASS'); showRowById('WS_PASS');
@@ -67,11 +71,14 @@ leimnud.event.add(getField('WE_TYPE'), 'change', function() {
showRowById('subtitle2'); showRowById('subtitle2');
} }
else { else {
hideRowById("TEST");
showRowById("SEARCH");
hideRowById('WS_USER'); hideRowById('WS_USER');
hideRowById('WS_PASS'); hideRowById('WS_PASS');
hideRowById('WS_ROUNDROBIN'); hideRowById('WS_ROUNDROBIN');
hideRowById('subtitle2'); hideRowById('subtitle2');
}hideRowById('WS_ROUNDROBIN'); }hideRowById('WS_ROUNDROBIN');
}.extend(getField('WE_TYPE'))); }.extend(getField('WE_TYPE')));
@@ -82,7 +89,7 @@ leimnud.event.add(getField('WE_TYPE'), 'change', function() {
* @makes a rpc to processes_webEntryValidate in order to validate if the * @makes a rpc to processes_webEntryValidate in order to validate if the
* process user has the permissions to create and use a webentry * process user has the permissions to create and use a webentry
*/ */
var webEntry_validate = function(PRO_UID, TASKS, DYNAFORM) { var webEntry_validate = function(PRO_UID, TASKS, DYNAFORM) {
//G.alert(PRO_UID); //G.alert(PRO_UID);
// G.alert(getField('WE_TYPE').value); // G.alert(getField('WE_TYPE').value);
@@ -118,6 +125,8 @@ var tasksName = getField('TASKS')[getField('TASKS').selectedIndex].innerHTML;
//var scs=rpc.xmlhttp.responseText.extractScript(); //var scs=rpc.xmlhttp.responseText.extractScript();
//scs.evalScript(); //scs.evalScript();
if(rpc.xmlhttp.responseText>=1){ if(rpc.xmlhttp.responseText>=1){
showRowById("SEARCH");
getField('SEARCH').disabled = false; getField('SEARCH').disabled = false;
//webEntry_generate(PRO_UID); //webEntry_generate(PRO_UID);
} else { } else {
@@ -129,7 +138,7 @@ var tasksName = getField('TASKS')[getField('TASKS').selectedIndex].innerHTML;
} }
} }
var webEntry_generate = function(PRO_UID, TASKS, DYNAFORM) { var webEntry_generate = function(PRO_UID, TASKS, DYNAFORM) {
@@ -144,7 +153,7 @@ var webEntry_generate = function(PRO_UID, TASKS, DYNAFORM) {
} }
else else
{ if(odynaform.value=='') { if(odynaform.value=='')
{ alert('This process does not have an assigned dynaform'); { alert('This process does not have an assigned dynaform');
} }
else else
{ sw=1; { sw=1;
@@ -180,7 +189,7 @@ var webEntry_generate = function(PRO_UID, TASKS, DYNAFORM) {
scs.evalScript(); scs.evalScript();
}.extend(this); }.extend(this);
oRPC.make(); oRPC.make();
} }
else else
{ {
var k = new leimnud.module.rpc.xmlhttp({ var k = new leimnud.module.rpc.xmlhttp({
@@ -188,28 +197,28 @@ var webEntry_generate = function(PRO_UID, TASKS, DYNAFORM) {
async : true, async : true,
method: 'POST', method: 'POST',
args : "action=webEntry_Val_Assig&data="+{ args : "action=webEntry_Val_Assig&data="+{
PRO_UID:PRO_UID, PRO_UID:PRO_UID,
TASKS:getField('TASKS').value, TASKS:getField('TASKS').value,
DYNAFORM:getField('DYNAFORM').value DYNAFORM:getField('DYNAFORM').value
}.toJSONString() }.toJSONString()
}); });
k.callback = function(rpc){ k.callback = function(rpc){
if(rpc.xmlhttp.responseText!=1){ if(rpc.xmlhttp.responseText!=1){
msgBox(G_STRINGS.WEBEN_ONLY_BALANCEDJS,"alert"); msgBox(G_STRINGS.WEBEN_ONLY_BALANCEDJS,"alert");
} }
}.extend(this); }.extend(this);
k.make(); k.make();
var oRPC = new leimnud.module.rpc.xmlhttp({ var oRPC = new leimnud.module.rpc.xmlhttp({
url : '../processes/processes_Ajax', url : '../processes/processes_Ajax',
async : true, async : true,
method: 'POST', method: 'POST',
args : "action=webEntry_generate&data="+{PRO_UID:PRO_UID, TASKS:getField('TASKS').value, DYNAFORM:getField('DYNAFORM').value, WE_TYPE:getField('WE_TYPE').value, WS_USER:getField('WS_USER').value, WS_PASS:getField('WS_PASS').value, WS_ROUNDROBIN:getField('WS_ROUNDROBIN').value, WE_USR:getField('WE_USR').value }.toJSONString() args : "action=webEntry_generate&data="+{PRO_UID:PRO_UID, TASKS:getField('TASKS').value, DYNAFORM:getField('DYNAFORM').value, WE_TYPE:getField('WE_TYPE').value, WS_USER:getField('WS_USER').value, WS_PASS:getField('WS_PASS').value, WS_ROUNDROBIN:getField('WS_ROUNDROBIN').value, WE_USR:getField('WE_USR').value }.toJSONString()
}); });
oRPC.make(); oRPC.make();
oPanel.remove(); oPanel.remove();
Pm.tmp.editProcessPanel.clearContent(); Pm.tmp.editProcessPanel.clearContent();
Pm.tmp.editProcessPanel.loader.show(); Pm.tmp.editProcessPanel.loader.show();
var r = new leimnud.module.rpc.xmlhttp({ var r = new leimnud.module.rpc.xmlhttp({
url:'../processes/processes_Ajax', url:'../processes/processes_Ajax',
@@ -222,7 +231,7 @@ var webEntry_generate = function(PRO_UID, TASKS, DYNAFORM) {
Pm.tmp.editProcessPanel.loader.hide(); Pm.tmp.editProcessPanel.loader.hide();
var scs = rpc.xmlhttp.responseText.extractScript(); var scs = rpc.xmlhttp.responseText.extractScript();
Pm.tmp.editProcessPanel.addContent(rpc.xmlhttp.responseText); Pm.tmp.editProcessPanel.addContent(rpc.xmlhttp.responseText);
scs.evalScript(); scs.evalScript();
}.extend(this,panel); }.extend(this,panel);
r.make(); r.make();
} }