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

HOR-4263

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2018-02-09 16:28:23 -04:00
committed by Paula Quispe
parent e2793d9e2e
commit 79e0b778c5
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/controllers/admin.php
View File

@@ -23,7 +23,7 @@ class Admin extends Controller
$skinsList = System::getSkingList(); $skinsList = System::getSkingList();
foreach ($skinsList['skins'] as $key => $value) { foreach ($skinsList['skins'] as $key => $value) {
if ($value['SKIN_WORKSPACE'] != G::LoadTranslation('ID_GLOBAL')) { if ($value['SKIN_TYPE_GLOBAL'] === false) {
unset( $skinsList['skins'][$key] ); unset( $skinsList['skins'][$key] );
} }
} }

12
workflow/engine/src/ProcessMaker/Core/System.php
View File

@@ -1053,7 +1053,17 @@ class System
} }
$res['SKIN_CREATEDATE'] = (isset($res['SKIN_CREATEDATE'])) ? $res['SKIN_CREATEDATE'] : ''; $res['SKIN_CREATEDATE'] = (isset($res['SKIN_CREATEDATE'])) ? $res['SKIN_CREATEDATE'] : '';
$res['SKIN_MODIFIEDDATE'] = (isset($res['SKIN_MODIFIEDDATE'])) ? $res['SKIN_MODIFIEDDATE'] : ''; $res['SKIN_MODIFIEDDATE'] = (isset($res['SKIN_MODIFIEDDATE'])) ? $res['SKIN_MODIFIEDDATE'] : '';
$res['SKIN_WORKSPACE'] = (isset($res['SKIN_WORKSPACE'])) ? (($res['SKIN_WORKSPACE'] != '') ? $res['SKIN_WORKSPACE'] : $global) : $global;
$res['SKIN_TYPE_GLOBAL'] = false;
if (isset($res['SKIN_WORKSPACE'])) {
if ($res['SKIN_WORKSPACE'] === '') {
$res['SKIN_WORKSPACE'] = $global;
$res['SKIN_TYPE_GLOBAL'] = true;
}
} else {
$res['SKIN_WORKSPACE'] = $global;
$res['SKIN_TYPE_GLOBAL'] = true;
}
$swWS = true; $swWS = true;
if ($res['SKIN_WORKSPACE'] != $global) { if ($res['SKIN_WORKSPACE'] != $global) {