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

Changes for DocSystem

Browse Source 
Changes for DocSystem with PARTNER_FLAG
This commit is contained in:
norahmollo
2013-04-19 19:30:41 +00:00
parent cfb79f030c
commit 3d832c971d
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
workflow/engine/methods/setup/skin_Ajax.php
View File

@@ -45,25 +45,33 @@ function skinList ()
G::loadClass( 'system' ); G::loadClass( 'system' );
$skinList = System::getSkingList(); $skinList = System::getSkingList();
$wildcard = ''; $wildcard = '';
if (isset( $_REQUEST['activeskin'] )) { if (isset( $_REQUEST['activeskin'] )) {
$wildcard = '@'; $wildcard = '@';
} }
$classicSkin = '';
if (defined('PARTNER_FLAG')) {
$classicSkin = '00000000000000000000000000000001';
}
foreach ($skinList['skins'] as $key => $value) { foreach ($skinList['skins'] as $key => $value) {
if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs' && $value['SKIN_FOLDER_ID'] != 'uxmodern') { if ($value['SKIN_ID'] != $classicSkin) {
if ($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']) { if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs' && $value['SKIN_FOLDER_ID'] != 'uxmodern') {
$value['SKIN_STATUS'] = $wildcard . G::LoadTranslation( 'ID_ACTIVE' ); if ($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']) {
$value['SKIN_NAME'] = $wildcard . $value['SKIN_NAME']; $value['SKIN_STATUS'] = $wildcard . G::LoadTranslation( 'ID_ACTIVE' );
$value['SKIN_WORKSPACE'] = $wildcard . $value['SKIN_WORKSPACE']; $value['SKIN_NAME'] = $wildcard . $value['SKIN_NAME'];
$value['SKIN_DESCRIPTION'] = $wildcard . $value['SKIN_DESCRIPTION']; $value['SKIN_WORKSPACE'] = $wildcard . $value['SKIN_WORKSPACE'];
$value['SKIN_AUTHOR'] = $wildcard . $value['SKIN_AUTHOR']; $value['SKIN_DESCRIPTION'] = $wildcard . $value['SKIN_DESCRIPTION'];
$value['SKIN_CREATEDATE'] = $wildcard . $value['SKIN_CREATEDATE']; $value['SKIN_AUTHOR'] = $wildcard . $value['SKIN_AUTHOR'];
$value['SKIN_MODIFIEDDATE'] = $wildcard . $value['SKIN_MODIFIEDDATE']; $value['SKIN_CREATEDATE'] = $wildcard . $value['SKIN_CREATEDATE'];
} else { $value['SKIN_MODIFIEDDATE'] = $wildcard . $value['SKIN_MODIFIEDDATE'];
$value['SKIN_STATUS'] = G::LoadTranslation( 'ID_INACTIVE' ); } else {
$value['SKIN_STATUS'] = G::LoadTranslation( 'ID_INACTIVE' );
}
$skinListArray['skins'][] = $value;
} }
$skinListArray['skins'][] = $value;
} }
} }
$skinListArray['currentSkin'] = $skinList['currentSkin']; $skinListArray['currentSkin'] = $skinList['currentSkin'];

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

@@ -132,7 +132,13 @@ Ext.onReady(function(){
rowSelected = infoGrid.getSelectionModel().getSelected(); rowSelected = infoGrid.getSelectionModel().getSelected();
if((rowSelected.data.SKIN_FOLDER_ID)&&((rowSelected.data.SKIN_FOLDER_ID!="classic"))){ if((rowSelected.data.SKIN_FOLDER_ID)&&((rowSelected.data.SKIN_FOLDER_ID!="classic"))){
exportButton.enable(); exportButton.enable();
deleteButton.enable();
if (rowSelected.data.SKIN_STATUS!='Inactive') {
deleteButton.disable();
} else {
deleteButton.enable();
}
}else{ }else{
exportButton.disable(); exportButton.disable();
deleteButton.disable(); deleteButton.disable();
@@ -363,6 +369,7 @@ showdate = function (value){
selectedSkin = function (value){ selectedSkin = function (value){
if(gotWildCard(value)){ if(gotWildCard(value)){
deleteButton.disable();
return setBoldItalic(value.substring(1)); return setBoldItalic(value.substring(1));
} }
return value; return value;