fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in cochalo/processmaker (pull request #188)

Browse Source 
Correcion de notice en REPORT TABLES y arreglo de validacion en DBC
This commit is contained in:
erik ao
2014-02-13 11:18:58 -04:00
parent 054af6286b da4d160240
commit bfe879e794
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/src/BusinessModel/Table.php
View File

@@ -239,7 +239,7 @@ class Table
$reservedWordsSql = G::reservedWordsSql();
if ($reportFlag) {
$defaultColumns = $this->getReportTableDefaultColumns($data['REP_TAB_TYPE']);
$defaultColumns = $this->getReportTableDefaultColumns($dataValidate['REP_TAB_TYPE']);
$columns = array_merge( $defaultColumns, $columns );
}

20
workflow/engine/src/Services/Api/ProcessMaker/Project/DataBaseConnection.php
View File

@@ -58,12 +58,12 @@ class DataBaseConnection extends Api
* @param string $prj_uid {@min 1} {@max 32}
* @param array $request_data
*
* @param string $dbs_type {@from body}
* @param string $dbs_server {@from body}
* @param string $dbs_database_name {@from body}
* @param string $dbs_type {@from body} {@required true}
* @param string $dbs_server {@from body} {@required true}
* @param string $dbs_database_name {@from body} {@required true}
* @param string $dbs_username {@from body}
* @param string $dbs_port {@from body}
* @param string $dbs_encode {@from body}
* @param string $dbs_port {@from body} {@type float}
* @param string $dbs_encode {@from body} {@required true}
* @param string $dbs_password {@from body}
* @param string $dbs_description {@from body}
* @return array
@@ -99,12 +99,12 @@ class DataBaseConnection extends Api
* @param string $prj_uid {@min 1} {@max 32}
* @param array $request_data
*
* @param string $dbs_type {@from body}
* @param string $dbs_server {@from body}
* @param string $dbs_database_name {@from body}
* @param string $dbs_type {@from body} {@required true}
* @param string $dbs_server {@from body} {@required true}
* @param string $dbs_database_name {@from body} {@required true}
* @param string $dbs_username {@from body}
* @param string $dbs_port {@from body}
* @param string $dbs_encode {@from body}
* @param string $dbs_port {@from body} {@type float}
* @param string $dbs_encode {@from body} {@required true}
* @param string $dbs_password {@from body}
* @param string $dbs_description {@from body}
* @return array