Sfoglia il codice sorgente

- Fixed an error appearing only for non admins.
- Admin menu should never appear for non-admins, even empty
- Synchro Data Source objects are for admins only

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1180 a333f486-631f-4898-b8df-5754b55c2be0

dflaven 14 anni fa
parent
commit
1af32c3695

+ 1 - 1
core/userrights.class.inc.php

@@ -920,7 +920,7 @@ class StimulusChecker extends ActionChecker
 	{
 		$sClass = $this->oFilter->GetClass();
 		$oSet = new DBObjectSet($this->oFilter);
-		$iActionAllowed = UserRights::IsStimulusAllowed($sClass, $oSet, $this->iActionCode);
+		$iActionAllowed = UserRights::IsStimulusAllowed($sClass,  $this->iActionCode, $oSet);
 		if ($iActionAllowed == UR_ALLOWED_NO)
 		{
 			$this->iAllowedCount = 0;

+ 2 - 3
synchro/synchrodatasource.class.inc.php

@@ -1257,7 +1257,6 @@ class SynchroReplica extends DBObject implements iDisplay
 
 		MetaModel::Init_AddAttribute(new AttributeDateTime("info_creation_date", array("allowed_values"=>null, "sql"=>"info_creation_date", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeDateTime("info_last_modified", array("allowed_values"=>null, "sql"=>"info_last_modified", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("info_last_synchro", array("allowed_values"=>null, "sql"=>"info_last_synchro", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 
 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('sync_source_id', 'dest_id', 'dest_class', 'status_last_seen', 'status', 'status_dest_creator', 'status_last_error', 'info_creation_date', 'info_last_modified', 'info_last_synchro')); // Attributes to be displayed for the complete details
@@ -1718,8 +1717,8 @@ class SynchroReplica extends DBObject implements iDisplay
 	}
 }
 
-// TO DO: finalize.... admins only ? which options ? troubleshoot WebPageMenuNode::__construct(.... sEnableClass...) ?
-//if (UserRights::IsAdministrator())
+// Only for admins
+if (UserRights::IsAdministrator())
 {
 	$oAdminMenu = new MenuGroup('AdminTools', 80 /* fRank */);
 	new OQLMenuNode('DataSources', 'SELECT SynchroDataSource', $oAdminMenu->GetIndex(), 12 /* fRank */, true, 'SynchroDataSource', UR_ACTION_MODIFY, UR_ALLOWED_YES);