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

This commit is contained in:
Marco Antonio Nina
2012-02-23 12:34:58 -04:00
2 changed files with 16 additions and 9 deletions

View File

@@ -913,22 +913,22 @@ var resendMessage = function(APP_UID, APP_MSG_UID)
}; };
function showdebug(){ function showdebug()
if( typeof parent != 'undefined' ){ {
if( typeof parent.parent != 'undefined' ){ if ( typeof(parent) != 'undefined' ) {
if( ! parent.parent.PANEL_EAST_OPEN ) { if ( typeof(parent.parent) != 'undefined' ) {
parent.parent.PANEL_EAST_OPEN = true; if ( ! parent.parent.PANEL_EAST_OPEN ) {
var debugPanel = parent.parent.Ext.getCmp('debugPanel'); var debugPanel = parent.parent.Ext.getCmp('debugPanel');
parent.parent.PANEL_EAST_OPEN = true;
debugPanel.show(); debugPanel.show();
debugPanel.ownerCt.doLayout(); debugPanel.ownerCt.doLayout();
debugPanel.expand(); debugPanel.expand();
}
parent.parent.propStore.load(); parent.parent.propStore.load();
parent.parent.triggerStore.load(); parent.parent.triggerStore.load();
} }
} }
}
} }
var uploadInputDocument = function(docID,appDocId,docVersion,actionType){ var uploadInputDocument = function(docID,appDocId,docVersion,actionType){

View File

@@ -336,7 +336,14 @@ Ext.onReady(function(){
reader: reader, reader: reader,
sortInfo:{field: 'name', direction: "ASC"}, sortInfo:{field: 'name', direction: "ASC"},
groupField:'execution_time', groupField:'execution_time',
proxy: new Ext.data.HttpProxy({url: 'debug_triggers?r='+Math.random()}) proxy: new Ext.data.HttpProxy({url: 'debug_triggers?r='+Math.random()}),
listeners: {
load : function() {
var detailPanel = Ext.getCmp('debug-details-panel');
detailPanel.setTitle('');
debugTriggersDetailTpl.overwrite(detailPanel.body, {});
}
}
}); });
var debugTriggers = new xg.GridPanel({ var debugTriggers = new xg.GridPanel({