BUG 0000 PM tables imporovements
- Setting order to available fields on report table edit UI
This commit is contained in:
@@ -84,6 +84,7 @@ class pmTables extends Controller
|
||||
);
|
||||
}
|
||||
}
|
||||
sort($fieldsList);
|
||||
$this->setJSVar('avFieldsList', $fieldsList);
|
||||
$repTabPluginPermissions = $this->_getSimpleReportPluginDef();
|
||||
$this->setJSVar('_plugin_permissions', $repTabPluginPermissions);
|
||||
@@ -103,7 +104,7 @@ class pmTables extends Controller
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
sort($fieldsList);
|
||||
$this->setJSVar('avFieldsList', $fieldsList);
|
||||
$repTabPluginPermissions = $this->_getSimpleReportPluginDef();
|
||||
break;
|
||||
@@ -189,3 +190,4 @@ class pmTables extends Controller
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -134,7 +134,7 @@ class pmTablesProxy extends HttpProxyController
|
||||
);
|
||||
}
|
||||
}
|
||||
$resultList['processFields'] = $aProcessGridFields;
|
||||
$resultList = $aProcessGridFields;
|
||||
|
||||
} else {
|
||||
$aProcessFields = Array();
|
||||
@@ -146,10 +146,12 @@ class pmTablesProxy extends HttpProxyController
|
||||
'FIELD_NAME' => $dfield['name']
|
||||
);
|
||||
}
|
||||
$resultList['processFields'] = $aProcessFields;
|
||||
$resultList = $aProcessFields;
|
||||
}
|
||||
|
||||
sort($resultList);
|
||||
|
||||
return $resultList;
|
||||
return array('processFields'=>$resultList);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -936,4 +938,4 @@ class aTablesMap{
|
||||
$this->aMap[$item] = $equal;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -161,7 +161,7 @@ var processmap=function(){
|
||||
panel.clearContent();
|
||||
var iframe=document.createElement('iframe');
|
||||
iframe.setAttribute('id','reportTablesIframe');
|
||||
iframe.src = '../reportTables/main?PRO_UID=' + this.options.uid;
|
||||
iframe.src = '../pmTables?PRO_UID=' + this.options.uid;
|
||||
iframe.style.border='0px';
|
||||
iframe.style.width='786px';
|
||||
iframe.style.height='564px';
|
||||
|
||||
@@ -38,15 +38,18 @@ Ext.onReady(function(){
|
||||
|
||||
pageSize = parseInt(CONFIG.pageSize);
|
||||
|
||||
var newMenuOptions = [
|
||||
{
|
||||
var newMenuOptions = new Array();
|
||||
if (PRO_UID == false) {
|
||||
newMenuOptions.push({
|
||||
text: 'New Table',
|
||||
handler: newPMTable
|
||||
}, {
|
||||
text: 'New Report Table',
|
||||
handler: NewReportTable
|
||||
}
|
||||
];
|
||||
});
|
||||
}
|
||||
|
||||
newMenuOptions.push({
|
||||
text: 'New Report Table',
|
||||
handler: NewReportTable
|
||||
});
|
||||
|
||||
if (PRO_UID !== false) {
|
||||
newMenuOptions.push({
|
||||
|
||||
Reference in New Issue
Block a user