composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-17 06:18:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3904 - Polishing: Backup

Browse Source
This commit is contained in:
acognet
2021-09-30 10:19:22 +02:00
parent 8fa6ae6703
commit 4d6a8a76aa
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
datamodels/2.x/itop-backup/status.php
View File

@@ -393,7 +393,7 @@ try {
$sEnvironment = addslashes(utils::GetCurrentEnvironment());
$oP->add_script(
<<<JS
<<<JS
function LaunchBackupNow()
{
$('#backup_success').addClass('ibo-is-hidden');
@@ -420,7 +420,7 @@ function LaunchBackupNow()
{
window.location.reload();
}
$('#waitbackup').modal('close');
$('#waitbackup').dialog('close');
});
}
}
@@ -464,11 +464,11 @@ function LaunchRestoreNow(sBackupFile, sConfirmationMessage)
$('#backup_success').html('$sRestoreDone');
$('#backup_success').removeClass('ibo-is-hidden');
}
$('#waitrestore').modal('close');
$('#waitrestore').dialog('close');
});
} else {
$('button.restore').prop('disabled', true);
$('#waitrestore').modal('close');
$('#waitrestore').dialog('close');
}
});
}

6
sources/application/Branding.php
View File

@@ -69,11 +69,11 @@ class Branding
public static function GetLogoAbsoluteUrl($sType = self::DEFAULT_LOGO_TYPE)
{
$sDefaultLogoPath = static::$aLogoPaths[$sType]['default'];
$sWorkingPath = APPROOT.'env-'.utils::GetCurrentEnvironment();
$aThemeParameters = json_decode(@file_get_contents($sWorkingPath.'/branding/logos.json'), true);
$sWorkingPath = APPROOT.'env-'.utils::GetCurrentEnvironment().'/';
$aThemeParameters = json_decode(@file_get_contents($sWorkingPath.'branding/logos.json'), true);
if ( isset( $aThemeParameters[$sType])) {
$sCustomLogoPath = $aThemeParameters[$sType];
if (file_exists(MODULESROOT.$sCustomLogoPath)) {
if (file_exists($sWorkingPath.$sCustomLogoPath)) {
return utils::GetAbsoluteUrlModulesRoot().$sCustomLogoPath.'?t='.utils::GetCacheBusterTimestamp();
}
}