fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in cochalo/processmaker (pull request #485)

Browse Source 
Adicion de label para exception en REPORT TABLE
This commit is contained in:
Erik Amaru Ortiz
2014-05-13 16:54:32 -04:00
parent d5933d58d0 2281fa7232
commit 29a9f502d1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/src/ProcessMaker/BusinessModel/Table.php
View File

@@ -203,7 +203,7 @@ class Table
$pro_uid = $this->validateProUid($pro_uid); $pro_uid = $this->validateProUid($pro_uid);
$dataValidate['TAB_UID'] = (isset($dataValidate['REP_UID'])) ? $dataValidate['REP_UID'] : ''; $dataValidate['TAB_UID'] = (isset($dataValidate['REP_UID'])) ? $dataValidate['REP_UID'] : '';
$dataValidate['PRO_UID'] = $pro_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']; $tempRepTabName = $dataValidate['REP_TAB_CONNECTION'];
$dataValidate['REP_TAB_CONNECTION'] = $this->validateRepConnection($tempRepTabName, $pro_uid); $dataValidate['REP_TAB_CONNECTION'] = $this->validateRepConnection($tempRepTabName, $pro_uid);
if ($dataValidate['REP_TAB_TYPE'] == 'GRID') { if ($dataValidate['REP_TAB_TYPE'] == 'GRID') {
@@ -969,11 +969,12 @@ class Table
* *
* @return string * @return string
*/ */
public function validateTabName ($rep_tab_name) public function validateTabName ($rep_tab_name, $reportFlag = false)
{ {
$rep_tab_name = trim($rep_tab_name); $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 ((strpos($rep_tab_name, ' ')) || (strlen($rep_tab_name) < 4)) {
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); $rep_tab_name = G::toUpper($rep_tab_name);
if (substr($rep_tab_name, 0, 4) != 'PMT_') { if (substr($rep_tab_name, 0, 4) != 'PMT_') {