Merge branch '2.0-dev' of git.colosa.net:/processmaker into 2.0-dev

This commit is contained in:
Julio Cesar Laura
2011-10-31 20:51:31 -04:00

View File

@@ -11,8 +11,7 @@ dashletInstance.form = {
Ext.Ajax.request({ Ext.Ajax.request({
url: "saveDashletInstance", url: "saveDashletInstance",
method: "POST", method: "POST",
params:{//"option": option, params:{"DAS_INS_UID": hiddenDasInsUID.getValue(),
//"DAS_INS_UID": "",
"DAS_UID": cboDasUID.getValue(), "DAS_UID": cboDasUID.getValue(),
"DAS_INS_TYPE": cboDasInsType.getValue(), "DAS_INS_TYPE": cboDasInsType.getValue(),
"DAS_INS_CONTEXT_TIME": cboDasInsContextTime.getValue(), "DAS_INS_CONTEXT_TIME": cboDasInsContextTime.getValue(),
@@ -31,8 +30,11 @@ dashletInstance.form = {
var dataResponse = Ext.util.JSON.decode(result.responseText) var dataResponse = Ext.util.JSON.decode(result.responseText)
switch (dataResponse.status) { switch (dataResponse.status) {
case "OK": Ext.MessageBox.alert("Message", "Dashboard Instance registered correctly"); break; case "OK": //Ext.MessageBox.alert("Message", "Dashboard Instance registered correctly");
default: Ext.MessageBox.alert("Alert", "Dashboard Instance registered failed"); break; window.location.href = "dashletsList";
break;
default: Ext.MessageBox.alert("Alert", "Dashboard Instance registered failed");
break;
} }
}, },
failure:function (result, request) { failure:function (result, request) {
@@ -42,21 +44,24 @@ dashletInstance.form = {
}); });
} }
dashletInstanceLoadProcessAjax = function () { dashletInstanceFrmLoad = function () {
var strUID = hiddenDasInsUID.getValue(); /*
if (DASHLET_INSTANCE.DAS_INS_UID.length > 0) {
"DAS_INS_UID": "",
"DAS_UID": cboDasUID.getValue(),
"DAS_INS_TYPE": cboDasInsType.getValue(),
"DAS_INS_CONTEXT_TIME": cboDasInsContextTime.getValue(),
//"DAS_INS_START_DATE": txtDasInsStartDate.getValue().format(txtDasInsStartDate.format),
//"DAS_INS_END_DATE": txtDasInsEndDate.getValue().format(txtDasInsEndDate.format),
"DAS_INS_OWNER_TYPE": cboDasInsOwnerType.getValue(),
"DAS_INS_OWNER_UID": cboDasInsOwnerUID.getValue()
//,
//"DAS_INS_PROCESSES": cboProcess.getValue(),
//"DAS_INS_TASKS": cboTask.getValue()
if (strUID.length > 0) { ////////////
dashletInstanceFrm.getForm().load({
url: "getRoutingInfo.php",
method: "POST",
params: {"DAS_INS_UID": strUID},
//failure: function(form, action) {
failure:function (result, request) {
Ext.Msg.alert("Load failed", "Failed");
}
});
} }
*/
} }
//------------------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------------------
@@ -169,8 +174,6 @@ dashletInstance.form = {
var hiddenDasInsUID = new Ext.form.Hidden({ var hiddenDasInsUID = new Ext.form.Hidden({
id: "hiddenDasInsUID", id: "hiddenDasInsUID",
name: "DAS_INS_UID", name: "DAS_INS_UID",
//value: ""
value: "1655406564eaf2b3bd3df47008036625"
}); });
var cboDasUID = new Ext.form.ComboBox({ var cboDasUID = new Ext.form.ComboBox({
@@ -383,6 +386,7 @@ dashletInstance.form = {
//------------------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------------------
//dashletInstanceLoadProcessAjax(); //dashletInstanceLoadProcessAjax();
var DASHLET_INSTANCE = Ext.util.JSON.decode(dashletInstance)
//------------------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------------------
var pnlMain = new Ext.Panel({ var pnlMain = new Ext.Panel({