composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Archives: refactoring of the API to enable/disable the archive mode

Browse Source 
SVN:trunk[4696]
This commit is contained in:
Romain Quetiez
2017-04-26 15:48:24 +00:00
parent a55245d203
commit e3931274ae
8 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/dbsearch.class.php
View File

@@ -48,7 +48,7 @@ abstract class DBSearch
public function __construct()
{
$this->m_bArchiveMode = self::GetArchiveModeDefault();
$this->m_bArchiveMode = utils::IsArchiveMode();
}
/**
@@ -62,16 +62,6 @@ abstract class DBSearch
abstract public function AllowAllData();
abstract public function IsAllDataAllowed();
static $bArchiveModeDefault = false;
static public function SetArchiveModeDefault($bEnable)
{
self::$bArchiveModeDefault = $bEnable;
}
static public function GetArchiveModeDefault()
{
return self::$bArchiveModeDefault;
}
public function SetArchiveMode($bEnable)
{
$this->m_bArchiveMode = $bEnable;

15
core/metamodel.class.php
View File

@@ -3450,12 +3450,6 @@ abstract class MetaModel
return $aDataDump;
}
protected static $m_bReadOnlyMode = false;
public static function DBSetReadOnly()
{
self::$m_bReadOnlyMode = true;
}
/*
* Determines wether the target DB is frozen or not
*/
@@ -3463,7 +3457,7 @@ abstract class MetaModel
{
// Improvement: check the mySQL variable -> Read-only
if (self::$m_bReadOnlyMode)
if (utils::IsArchiveMode())
{
return true;
}
@@ -4600,7 +4594,7 @@ abstract class MetaModel
$sModifierProperties = json_encode($aModifierProperties);
$sQuerySign .= '_all_'.md5($sModifierProperties);
}
$sQuerySign .= DBSearch::GetArchiveModeDefault() ? '_arch_' : '';
$sQuerySign .= utils::IsArchiveMode() ? '_arch_' : '';
if (!array_key_exists($sQuerySign, self::$aQueryCacheGetObject))
{
@@ -4693,10 +4687,9 @@ abstract class MetaModel
public static function GetObjectWithArchive($sClass, $iKey, $bMustBeFound = true, $bAllowAllData = false, $aModifierProperties = null)
{
$bPreviousMode = DBSearch::GetArchiveModeDefault();
DBSearch::SetArchiveModeDefault(true);
utils::PushArchiveMode(true);
$oObject = static::GetObject($sClass, $iKey, $bMustBeFound, $bAllowAllData, $aModifierProperties);
DBSearch::SetArchiveModeDefault($bPreviousMode);
utils::PopArchiveMode();
return $oObject;
}