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

Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2

Browse Source
This commit is contained in:
Dante
2015-04-02 20:28:30 -04:00
parent 5b687e5021 9d6582d4c6
commit dfff216809
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
workflow/engine/templates/strategicDashboard/formDashboard.js
View File

@@ -209,7 +209,8 @@ Ext.onReady( function() {
store: store,
displayInfo: true,
displayMsg: _('ID_GRID_PAGE_DISPLAYING_0WNER_MESSAGE') + '    ',
emptyMsg: _('ID_GRID_PAGE_NO_OWNER_MESSAGE'),
//emptyMsg: _('ID_GRID_PAGE_NO_OWNER_MESSAGE')
emptyMsg: ''
});
cmodel = new Ext.grid.ColumnModel({
@@ -517,7 +518,7 @@ Ext.onReady( function() {
Ext.MessageBox.show({
title: _('ID_CONFIRM'),
msg: _('ID_DELETE_INDICATOR_SURE'),
buttons: Ext.MessageBox.YESNOCANCEL,
buttons: Ext.MessageBox.YESNO,
fn: function(buttonId) {
switch(buttonId) {
case 'no':
@@ -532,9 +533,6 @@ Ext.onReady( function() {
tabActivate.remove(component.id);
tabPanel.remove(component);
break;
case 'cancel':
flag = true;
break;
}
},
scope: that
@@ -803,6 +801,7 @@ var addTab = function (flag) {
selectOnFocus : true,
typeAhead : true,
autocomplete : true,
width : 90,
triggerAction : 'all',
mode : 'local',
allowBlank : false,
@@ -823,7 +822,16 @@ var addTab = function (flag) {
maskRe : /([0-9\.]+)$/,
maxLength : 9,
width : 80,
allowBlank : false
allowBlank : false,
listeners : {
focus : function(tb, e) {
Ext.QuickTips.register({
target: tb,
title: _('ID_HELP'),
text: _('ID_GOAL_HELP')
});
}
}
}
],
listeners:
@@ -1070,7 +1078,7 @@ var saveDashboard = function () {
var saveAllIndicators = function (DAS_UID) {
for (var tab in tabActivate) {
if (tab == 'remove') {
if (tab == 'remove' || tab == 'indexOf' || tab == 'map') {
continue;
}
tabPanel.getItem(tabActivate[tab]).show();
@@ -1085,12 +1093,12 @@ var saveAllIndicators = function (DAS_UID) {
for (var index in fieldsTab) {
var node = fieldsTab[index];
if (index == 'remove') {
if (index == 'remove' || index == 'map') {
continue;
}
id = node.id;
if (id.indexOf('fieldSet_') != -1 ) {
if (typeof id == 'undefined' || id.indexOf('fieldSet_') != -1 ) {
continue;
}
id = id.split('_');