From 4b20b6918e70207026c7ec5eb40cbfcb23eab260 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Tue, 13 May 2014 16:44:37 -0400 Subject: [PATCH 1/2] Adicion de label para exception en REPORT TABLE --- .../engine/src/ProcessMaker/BusinessModel/Table.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Table.php b/workflow/engine/src/ProcessMaker/BusinessModel/Table.php index 7e055e12b..2a5a97bce 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Table.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Table.php @@ -203,7 +203,7 @@ class Table $pro_uid = $this->validateProUid($pro_uid); $dataValidate['TAB_UID'] = (isset($dataValidate['REP_UID'])) ? $dataValidate['REP_UID'] : ''; $dataValidate['PRO_UID'] = $pro_uid; - $dataValidate['REP_TAB_NAME'] = $this->validateTabName($dataValidate['REP_TAB_NAME']); + $dataValidate['REP_TAB_NAME'] = $this->validateTabName($dataValidate['REP_TAB_NAME'], $reportFlag); $tempRepTabName = $dataValidate['REP_TAB_CONNECTION']; $dataValidate['REP_TAB_CONNECTION'] = $this->validateRepConnection($tempRepTabName, $pro_uid); if ($dataValidate['REP_TAB_TYPE'] == 'GRID') { @@ -969,11 +969,16 @@ class Table * * @return string */ - public function validateTabName ($rep_tab_name) + public function validateTabName ($rep_tab_name, $reportFlag = false) { $rep_tab_name = trim($rep_tab_name); if ((strpos($rep_tab_name, ' ')) || (strlen($rep_tab_name) < 4)) { - throw (new \Exception("The property pmt_tab_name: '$rep_tab_name' is incorrect.")); + if ($reportFlag) { + throw (new \Exception("The property rep_tab_name: '$rep_tab_name' is incorrect.")); + } else { + throw (new \Exception("The property pmt_tab_name: '$rep_tab_name' is incorrect.")); + } + } $rep_tab_name = G::toUpper($rep_tab_name); if (substr($rep_tab_name, 0, 4) != 'PMT_') { From 2281fa7232953e5a812d0c20ade55b09c4152866 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Tue, 13 May 2014 16:47:46 -0400 Subject: [PATCH 2/2] Adicion de label para exception en REPORT TABLE --- workflow/engine/src/ProcessMaker/BusinessModel/Table.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Table.php b/workflow/engine/src/ProcessMaker/BusinessModel/Table.php index 2a5a97bce..244619e69 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Table.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Table.php @@ -972,13 +972,9 @@ class Table public function validateTabName ($rep_tab_name, $reportFlag = false) { $rep_tab_name = trim($rep_tab_name); + $nametype = ($reportFlag == false) ? 'pmt_tab_name' : 'rep_tab_name'; if ((strpos($rep_tab_name, ' ')) || (strlen($rep_tab_name) < 4)) { - if ($reportFlag) { - throw (new \Exception("The property rep_tab_name: '$rep_tab_name' is incorrect.")); - } else { - throw (new \Exception("The property pmt_tab_name: '$rep_tab_name' is incorrect.")); - } - + throw (new \Exception("The property $nametype: '$rep_tab_name' is incorrect.")); } $rep_tab_name = G::toUpper($rep_tab_name); if (substr($rep_tab_name, 0, 4) != 'PMT_') {