From 133c391723b612e2767e2bfb7815a845c4838bb6 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Thu, 13 Feb 2014 09:38:14 -0400 Subject: [PATCH 1/2] Adicion de validaciones en DATABASE CONNECTION --- .../Project/DataBaseConnection.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project/DataBaseConnection.php b/workflow/engine/src/Services/Api/ProcessMaker/Project/DataBaseConnection.php index 82e9d866b..617dd1c55 100644 --- a/workflow/engine/src/Services/Api/ProcessMaker/Project/DataBaseConnection.php +++ b/workflow/engine/src/Services/Api/ProcessMaker/Project/DataBaseConnection.php @@ -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_username {@from body} - * @param string $dbs_port {@from body} - * @param string $dbs_encode {@from body} + * @param string $dbs_type {@from body} {@min 1} + * @param string $dbs_server {@from body} {@min 1} + * @param string $dbs_database_name {@from body} {@min 1} + * @param string $dbs_username {@from body} {@min 1} + * @param string $dbs_port {@from body} {@type float} + * @param string $dbs_encode {@from body} {@min 1} * @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_username {@from body} - * @param string $dbs_port {@from body} - * @param string $dbs_encode {@from body} + * @param string $dbs_type {@from body} {@min 1} + * @param string $dbs_server {@from body} {@min 1} + * @param string $dbs_database_name {@from body} {@min 1} + * @param string $dbs_username {@from body} {@min 1} + * @param string $dbs_port {@from body} {@type float} + * @param string $dbs_encode {@from body} {@min 1} * @param string $dbs_password {@from body} * @param string $dbs_description {@from body} * @return array From da4d160240121b2e09df53d9133d5314cd566062 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Thu, 13 Feb 2014 09:53:55 -0400 Subject: [PATCH 2/2] Correcion de notice en REPORT TABLES y arreglo de validacion en DBC --- workflow/engine/src/BusinessModel/Table.php | 2 +- .../Project/DataBaseConnection.php | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/workflow/engine/src/BusinessModel/Table.php b/workflow/engine/src/BusinessModel/Table.php index fa4ca6860..303af39a0 100644 --- a/workflow/engine/src/BusinessModel/Table.php +++ b/workflow/engine/src/BusinessModel/Table.php @@ -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 ); } diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project/DataBaseConnection.php b/workflow/engine/src/Services/Api/ProcessMaker/Project/DataBaseConnection.php index 617dd1c55..d8ef3e77e 100644 --- a/workflow/engine/src/Services/Api/ProcessMaker/Project/DataBaseConnection.php +++ b/workflow/engine/src/Services/Api/ProcessMaker/Project/DataBaseConnection.php @@ -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} {@min 1} - * @param string $dbs_server {@from body} {@min 1} - * @param string $dbs_database_name {@from body} {@min 1} - * @param string $dbs_username {@from body} {@min 1} + * @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} {@type float} - * @param string $dbs_encode {@from body} {@min 1} + * @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} {@min 1} - * @param string $dbs_server {@from body} {@min 1} - * @param string $dbs_database_name {@from body} {@min 1} - * @param string $dbs_username {@from body} {@min 1} + * @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} {@type float} - * @param string $dbs_encode {@from body} {@min 1} + * @param string $dbs_encode {@from body} {@required true} * @param string $dbs_password {@from body} * @param string $dbs_description {@from body} * @return array