mirror of
https://github.com/Combodo/iTop.git
synced 2026-10-10 02:19:10 +02:00
Compare commits
1 Commits
develop
...
faf/162-di
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
556000e65b |
@@ -955,7 +955,7 @@ The hyperlink is displayed in the tooltip appearing on the “Lock” symbol of
|
||||
'Core:Synchro:LastestStatus' => 'Latest Status',
|
||||
'Core:Synchro:History' => 'Synchronization History',
|
||||
'Core:Synchro:NeverRun' => 'This synchro was never run. No log yet.',
|
||||
'Core:Synchro:SynchroEndedOn_Date' => 'The latest synchronization ended on %1$s.',
|
||||
'Core:Synchro:SynchroEndedOn_Date' => 'The latest synchronization ended on %1$s (duration: %2$s).',
|
||||
'Core:Synchro:SynchroRunningStartedOn_Date' => 'The synchronization started on %1$s is still running...',
|
||||
'Core:Synchro:label_repl_ignored' => 'Ignored (%1$s)',
|
||||
'Core:Synchro:label_repl_disappeared' => 'Disappeared (%1$s)',
|
||||
@@ -1007,7 +1007,7 @@ The hyperlink is displayed in the tooltip appearing on the “Lock” symbol of
|
||||
'Core:SyncDataSourceAccessRestriction' => 'Only adminstrators or the user specified in the data source can execute this operation. Operation cancelled.',
|
||||
'Core:SyncTooManyMissingReplicas' => 'All records have been untouched for some time (all of the objects could be deleted). Please check that the process that writes into the synchronization table is still running. Operation cancelled.',
|
||||
'Core:SyncSplitModeCLIOnly' => 'The synchronization can be executed in chunks only if run in mode CLI',
|
||||
'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s error(s), %3$s warning(s).',
|
||||
'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s error(s), %3$s warning(s). Peak Memory Usage: %4$s.',
|
||||
'Core:SynchroReplica:TargetObject' => 'Synchronized Object: %1$s',
|
||||
'Class:AsyncSendEmail' => 'Email (asynchronous)',
|
||||
'Class:AsyncSendEmail/Attribute:to' => 'To',
|
||||
|
||||
@@ -648,7 +648,7 @@ The hyperlink is displayed in the tooltip appearing on the “Lock” symbol of
|
||||
'Core:Synchro:LastestStatus' => 'Latest Status',
|
||||
'Core:Synchro:History' => 'Synchronisation History',
|
||||
'Core:Synchro:NeverRun' => 'This synchro was never run. No log yet.',
|
||||
'Core:Synchro:SynchroEndedOn_Date' => 'The latest synchronisation ended on %1$s.',
|
||||
'Core:Synchro:SynchroEndedOn_Date' => 'The latest synchronisation ended on %1$s (duration: %2$s).',
|
||||
'Core:Synchro:SynchroRunningStartedOn_Date' => 'The synchronisation started on %1$s is still running...',
|
||||
'Core:Synchro:label_repl_ignored' => 'Ignored (%1$s)',
|
||||
'Core:Synchro:label_repl_disappeared' => 'Disappeared (%1$s)',
|
||||
@@ -700,7 +700,7 @@ The hyperlink is displayed in the tooltip appearing on the “Lock” symbol of
|
||||
'Core:SyncDataSourceAccessRestriction' => 'Only administrators or the user specified in the data source can execute this operation. Operation cancelled.',
|
||||
'Core:SyncTooManyMissingReplicas' => 'All records have been untouched for some time (all of the objects could be deleted). Please check that the process that writes into the synchronisation table is still running. Operation cancelled.',
|
||||
'Core:SyncSplitModeCLIOnly' => 'The synchronisation can be executed in chunks only if run in mode CLI',
|
||||
'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s error(s), %3$s warning(s).',
|
||||
'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s error(s), %3$s warning(s).. Peak Memory Usage: %4$s.',
|
||||
'Core:SynchroReplica:TargetObject' => 'Synchronised Object: %1$s',
|
||||
'Class:AsyncSendEmail' => 'Email (asynchronous)',
|
||||
'Class:AsyncSendEmail/Attribute:to' => 'To',
|
||||
|
||||
@@ -654,7 +654,7 @@ Plusieurs champs peuvent ainsi être modifiés lors d\'une "mise à jour" en app
|
||||
'Core:Synchro:LastestStatus' => 'Dernier état',
|
||||
'Core:Synchro:History' => 'Historique de synchronisation',
|
||||
'Core:Synchro:NeverRun' => 'Aucun historique, la synchronisation n\'a pas encore fonctionné',
|
||||
'Core:Synchro:SynchroEndedOn_Date' => 'La dernière synchronisation s\'est terminée à: %1$s.',
|
||||
'Core:Synchro:SynchroEndedOn_Date' => 'La dernière synchronisation s\'est terminée à: %1$s (durée: %2$s).',
|
||||
'Core:Synchro:SynchroRunningStartedOn_Date' => 'Synchronisation en cours (début à %1$s)',
|
||||
'Core:Synchro:label_repl_ignored' => 'Ignorés (%1$s)',
|
||||
'Core:Synchro:label_repl_disappeared' => 'Disparus (%1$s)',
|
||||
@@ -706,7 +706,7 @@ Plusieurs champs peuvent ainsi être modifiés lors d\'une "mise à jour" en app
|
||||
'Core:SyncDataSourceAccessRestriction' => 'Seuls les administrateurs et l\'utilisateur spécifié dans la source de données peuvent exécuter cette synchronisation. Opération annulée.',
|
||||
'Core:SyncTooManyMissingReplicas' => 'Tous les réplicas sont absents de l\'import. L\'import a-t-il réellement tourné. Opération annulée.',
|
||||
'Core:SyncSplitModeCLIOnly' => 'La synchronization ne peut être exécutée partiellement qu\'en mode ligne de commande',
|
||||
'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s erreur(s), %3$s avertissement(s).',
|
||||
'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s erreur(s), %3$s avertissement(s). Pic mémoire: %4$s.',
|
||||
'Core:SynchroReplica:TargetObject' => 'Objet Synchronisé : %1$s',
|
||||
'Class:AsyncSendEmail' => 'Envoi d\'Email Asynchrone',
|
||||
'Class:AsyncSendEmail/Attribute:to' => 'A',
|
||||
|
||||
@@ -405,9 +405,18 @@ class SynchroDataSource extends cmdbAbstractObject
|
||||
// Still running !
|
||||
$oPage->p('<h2>'.Dict::Format('Core:Synchro:SynchroRunningStartedOn_Date', $sStartDate).'</h2>');
|
||||
} else {
|
||||
$sEndDate = $oLastLog->GetAsHTML('end_date');
|
||||
$iLastLog = $oLastLog->GetKey();
|
||||
$oPage->p('<h2>'.Dict::Format('Core:Synchro:SynchroEndedOn_Date', $sEndDate).'</h2>');
|
||||
|
||||
$sStartDate = $oLastLog->Get('start_date');
|
||||
$sEndDate = $oLastLog->Get('end_date');
|
||||
$oStartDate = new DateTime($sStartDate);
|
||||
$oEndDate = new DateTime($sEndDate);
|
||||
/** @var integer $iDuration */
|
||||
$iDuration = $oEndDate->format('U') - $oStartDate->format('U');
|
||||
$sDuration = AttributeDuration::FormatDuration($iDuration);
|
||||
$sEndDate = $oLastLog->GetAsHTML('end_date');
|
||||
|
||||
$oPage->p('<h2>'.Dict::Format('Core:Synchro:SynchroEndedOn_Date', $sEndDate, $sDuration).'</h2>');
|
||||
$sOQL = "SELECT SynchroReplica WHERE sync_source_id=$iDSid";
|
||||
$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL));
|
||||
$iCountAllReplicas = $oSet->Count();
|
||||
@@ -420,11 +429,14 @@ class SynchroDataSource extends cmdbAbstractObject
|
||||
$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL));
|
||||
$iCountAllWarnings = $oSet->Count();
|
||||
$sAllWarnings = "<a href=\"../synchro/replica.php?operation=oql&datasource=$iDSid&oql=$sOQL\">$iCountAllWarnings</a>";
|
||||
$iMemPeakInMo = sprintf('%.2f Mo', $oLastLog->Get('memory_usage_peak') / (1024 * 1024));
|
||||
|
||||
$oPage->p('<h2>'.Dict::Format(
|
||||
'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings',
|
||||
$sAllReplicas,
|
||||
$sAllErrors,
|
||||
$sAllWarnings
|
||||
$sAllWarnings,
|
||||
$iMemPeakInMo
|
||||
).'</h2>');
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user