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

Merged in bugfix/PMCORE-3377 (pull request #8186)

Browse Source 
PMCORE-3377 An alert notice is displayed before creating a table

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Roly Gutierrez
2021-09-29 17:55:59 +00:00
committed by Julio Cesar Laura Avendaño
parent ec8a259ee0 9886c0e141
commit 53d565be81
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/controllers/adminProxy.php
View File

@@ -785,6 +785,12 @@ class adminProxy extends HttpProxyController
$width = "100%"; $width = "100%";
$upload = new ReplacementLogo(); $upload = new ReplacementLogo();
$aPhotoSelect = $upload->getNameLogo($_SESSION['USER_LOGGED']); $aPhotoSelect = $upload->getNameLogo($_SESSION['USER_LOGGED']);
if (!is_array($aPhotoSelect)) {
$aPhotoSelect = [];
}
if (!isset($aPhotoSelect['DEFAULT_LOGO_NAME'])) {
$aPhotoSelect['DEFAULT_LOGO_NAME'] = '';
}
$sPhotoSelect = trim($aPhotoSelect['DEFAULT_LOGO_NAME']); $sPhotoSelect = trim($aPhotoSelect['DEFAULT_LOGO_NAME']);
$check = ''; $check = '';
$ainfoSite = explode("/", $_SERVER["REQUEST_URI"]); $ainfoSite = explode("/", $_SERVER["REQUEST_URI"]);

6
workflow/engine/controllers/pmTables.php
View File

@@ -94,10 +94,10 @@ class pmTables extends Controller
if ($table['ADD_TAB_TYPE'] == 'NORMAL' || $table['ADD_TAB_TYPE'] == 'GRID') { if ($table['ADD_TAB_TYPE'] == 'NORMAL' || $table['ADD_TAB_TYPE'] == 'GRID') {
$repTabPluginPermissions = $this->_getSimpleReportPluginDef(); $repTabPluginPermissions = $this->_getSimpleReportPluginDef();
} }
}
if (preg_match("/^PMT_(.*)$/", $table['ADD_TAB_NAME'], $match)) { if (preg_match("/^PMT_(.*)$/", $table['ADD_TAB_NAME'], $match)) {
$table['ADD_TAB_NAME'] = $match[1]; $table['ADD_TAB_NAME'] = $match[1];
}
} }
$this->includeExtJS( 'pmTables/' . $jsFile ); $this->includeExtJS( 'pmTables/' . $jsFile );