fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 7817 Se puede ver todos los skins que tiene el servidor... SOLVED

Browse Source 
- No was validated skin.
- Was add validation a skin for workspaces.
This commit is contained in:
Marco Antonio Nina
2012-10-29 09:25:05 -04:00
parent 8695139590
commit 4469f7b2bb
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/classes/class.system.php
View File

@@ -942,6 +942,7 @@ class System
}
$customSkins = array_merge( $baseSkins, $customSkins );
$global = G::LoadTranslation('ID_GLOBAL');
//Read and parse each Configuration File
foreach ($customSkins as $key => $configInformation) {
@@ -964,10 +965,10 @@ class System
}
$res['SKIN_CREATEDATE'] = (isset($res['SKIN_CREATEDATE'])) ? $res['SKIN_CREATEDATE']: '';
$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_WORKSPACE'] = (isset($res['SKIN_WORKSPACE'])) ? ( ($res['SKIN_WORKSPACE'] != '')? $res['SKIN_WORKSPACE'] : $global): $global;
$swWS = true;
if ($res['SKIN_WORKSPACE'] != 'Global') {
if ($res['SKIN_WORKSPACE'] != $global) {
$workspace = explode("|", $res['SKIN_WORKSPACE']);
$swWS = false;
foreach ($workspace as $key => $value) {

14
workflow/engine/templates/setup/skinList.js
View File

@@ -418,10 +418,10 @@ selectedSkinChecked = function (value){
nameWorkspace = function (value){
if(value[0]=='@'){
str = value.substring(1);
return '<b><i>' + ((value == 'Global') ? value : 'Workspace') + '</i></b>';
return '<b><i>' + ((value == _('ID_GLOBAL')) ? value : _('ID_WORKSPACE')) + '</i></b>';
}
if (value != 'Global') {
value = "Workspace";
if (value != _('ID_GLOBAL')) {
value = _('ID_WORKSPACE');
}
return value;
};
@@ -533,13 +533,13 @@ newSkin = function(){
name: 'workspace',
inputValue: 'global',
checked: true,
boxLabel: 'All Workspace'
boxLabel: _('ID_ALL_WORKSPACES')
},
{
xtype: 'radio',
name: 'workspace',
inputValue: 'current',
boxLabel: 'Current Workspace'
boxLabel: _('ID_CURRENT_WORKSPACE')
}
],
buttons:[
@@ -653,13 +653,13 @@ importSkin = function(){
name: 'workspace',
inputValue: 'global',
checked: true,
boxLabel: 'All Workspace'
boxLabel: _('ID_ALL_WORKSPACES')
},
{
xtype: 'radio',
name: 'workspace',
inputValue: 'current',
boxLabel: 'Current Workspace'
boxLabel: _('ID_CURRENT_WORKSPACE')
}
],
buttons:[