Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2364)

NDD-75 El inbox da error de filterStatus
This commit is contained in:
Dante Loayza
2015-06-18 10:44:47 -04:00

View File

@@ -1058,6 +1058,9 @@ Ext.onReady ( function() {
}); });
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
if (typeof filterStatus == 'undefined') {
filterStatus = [];
}
var comboFilterStatus = new Ext.form.ComboBox({ var comboFilterStatus = new Ext.form.ComboBox({
width : 180, width : 180,
boxMaxWidth : 200, boxMaxWidth : 200,
@@ -1071,6 +1074,7 @@ Ext.onReady ( function() {
mode : 'local', mode : 'local',
autocomplete : true, autocomplete : true,
triggerAction : 'all', triggerAction : 'all',
hidden : filterStatus.length == 0 ? true : false,
store : new Ext.data.ArrayStore({ store : new Ext.data.ArrayStore({
fields : ['UID','NAME'], fields : ['UID','NAME'],
data : filterStatus data : filterStatus
@@ -1705,8 +1709,11 @@ Ext.onReady ( function() {
'-', '-',
btnAll, btnAll,
'->', // begin using the right-justified button container '->', // begin using the right-justified button container
filterStatus.length != 0 ?[
_('ID_OVERDUE'), _('ID_OVERDUE'),
comboFilterStatus, comboFilterStatus
] : [
],
_("ID_CATEGORY"), _("ID_CATEGORY"),
comboCategory, comboCategory,
"-", "-",