composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.2' into develop

Browse Source 
# Conflicts:
#	sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanel.php
This commit is contained in:
Eric Espie
2025-01-13 09:18:00 +01:00
parent 79a46581ef efb7831a5a
commit e0b12144cb
65 changed files with 1746 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
synchro/synchrodatasource.class.inc.php
View File

@@ -92,7 +92,7 @@ class SynchroDataSource extends cmdbAbstractObject
'depends_on' => array(),
)));
//MetaModel::Init_AddAttribute(new AttributeDateTime("last_synchro_date", array("allowed_values"=>null, "sql"=>"last_synchro_date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
//MetaModel::Init_AddAttribute(new AttributeDateTime("last_synchro_date", array("allowed_values"=>null, "sql"=>"last_synchro_date", "default_value"=>"NOW()", "is_null_allowed"=>false, "depends_on"=>array())));
// Format: seconds (int)
MetaModel::Init_AddAttribute(new AttributeDuration('full_load_periodicity', array(
@@ -2029,7 +2029,7 @@ class SynchroReplica extends DBObject implements iDisplay
MetaModel::Init_AddAttribute(new AttributeDateTime('status_last_seen', array(
'allowed_values' => null,
'sql' => 'status_last_seen',
'default_value' => '',
'default_value' => 'NOW()',
'is_null_allowed' => false,
'depends_on' => array(),
)));