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

Merged in paulis/processmaker/HOR-163 (pull request #3778)

Browse Source 
HOR-163
This commit is contained in:
Julio Cesar Laura Avendaño
2016-03-03 17:52:05 -04:00
parent 32a03c99b1 c4dd8529ac
commit b1691485af
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
workflow/engine/templates/pmTables/editReport.js
View File

@@ -728,7 +728,8 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) {
storeId: "types",
autoDestroy: true,
fields: ["REP_TAB_TYPE", "type"]
fields: ["REP_TAB_TYPE", "type"],
data : [['NORMAL',_("ID_GLOBAL")],['GRID',_("ID_GRID")]]
});
comboReport = new Ext.form.ComboBox({
@@ -761,6 +762,7 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) {
}
});
dbConnectionsStore = new Ext.data.Store({
//autoLoad: true,
proxy : new Ext.data.HttpProxy({
@@ -882,7 +884,7 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) {
}
});
comboReport.setReadOnly(isBpmn);
comboReport.setDisabled(isBpmn);
processStore = new Ext.data.Store( {
autoLoad: true,
@@ -938,6 +940,7 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) {
}
});
var rptPosArray = 0;
processComboBox = new Ext.form.ComboBox({
id: 'PROCESS',
fieldLabel : _("ID_CASESLIST_APP_PRO_TITLE"),
@@ -964,9 +967,11 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) {
(dataStore[i].data.PRO_PROCESS_TYPE == "BPMN")? arrayBpmnTypeData : arrayClassicTypeData, false
);
var dataStoreAux = types.getRange(0);
var dataStoreAux = types.getRange(rptPosArray);
comboReport.setValue(dataStoreAux[0].data.REP_TAB_TYPE);
comboReport.setDisabled(dataStore[i].data.PRO_PROCESS_TYPE === "BPMN");
comboGridsList.setVisible(false);
comboDbConnections.getStore().reload({params:{PRO_UID : Ext.getCmp('PROCESS').getValue()}});