Merged feature/HOR-3559 into bugfix/HOR-3485-A

This commit is contained in:
jonathan Quispe
2017-08-10 14:26:24 -04:00
30 changed files with 340 additions and 337 deletions

View File

@@ -233,7 +233,7 @@ class Admin extends Controller
$dbNetView = new NET( DB_HOST );
$dbNetView->loginDbServer( DB_USER, DB_PASS );
$dbConns = new dbConnections( '' );
$dbConns = new DbConnections( '' );
$availdb = '';
foreach ($dbConns->getDbServicesAvailables() as $key => $val) {
if ($availdb != '') {

View File

@@ -696,7 +696,7 @@ class Main extends Controller
$dbNetView = new NET( DB_HOST );
$dbNetView->loginDbServer( DB_USER, DB_PASS );
$dbConns = new dbConnections( '' );
$dbConns = new DbConnections( '' );
$availdb = '';
foreach ($dbConns->getDbServicesAvailables() as $key => $val) {
if ($availdb != '') {

View File

@@ -1249,7 +1249,7 @@ class pmTablesProxy extends HttpProxyController
while ($aRow = $oDataset->getRow()) {
if (file_exists( PATH_DYNAFORM . PATH_SEP . $aRow['DYN_FILENAME'] . '.xml' )) {
$dynaformHandler = new dynaformHandler( PATH_DYNAFORM . $aRow['DYN_FILENAME'] . '.xml' );
$dynaformHandler = new DynaformHandler( PATH_DYNAFORM . $aRow['DYN_FILENAME'] . '.xml' );
$nodeFieldsList = $dynaformHandler->getFields();
foreach ($nodeFieldsList as $node) {
@@ -1559,7 +1559,7 @@ class pmTablesProxy extends HttpProxyController
}
}
} else {
$dynaformHandler = new dynaformHandler(PATH_DYNAFORM . $record['DYN_FILENAME'] . '.xml');
$dynaformHandler = new DynaformHandler(PATH_DYNAFORM . $record['DYN_FILENAME'] . '.xml');
$nodeFieldsList = $dynaformHandler->getFields();
foreach ($nodeFieldsList as $node) {