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

core/action.class.inc.php

@@ -41,6 +41,11 @@ require_once(APPROOT.'/core/email.class.inc.php');
  */
 abstract class Action extends cmdbAbstractObject
 {
+	/** @var $oCallingTrigger Trigger|null The trigger that called this action {@see DoExecute}
+	 * @since 3.2.0
+	 * */
+	protected ?Trigger $oCallingTrigger = null;
+	
 	/**
 	 * @throws \CoreException
 	 * @throws \Exception
@@ -270,6 +275,14 @@ abstract class ActionNotification extends Action
 //		MetaModel::Init_SetZListItems('default_search', array('name'));
 	}
 
+	/**
+	 * @inheritDoc
+	 */
+	public function DoExecute($oTrigger, $aContextArgs)
+	{
+		$this->oCallingTrigger = $oTrigger;
+	}
+
 	/**
 	 * @param $sLanguage
 	 * @param $sLanguageCode
@@ -419,17 +432,21 @@ class ActionEmail extends ActionNotification
 	 *
 	 * @param string $sRecipAttCode
 	 * @param array $aArgs
-	 * @param \Trigger|null $oTrigger
 	 *
 	 * @return string
-	 * @since 3.2.0 $oTrigger parameter added
 	 * @throws \ArchivedObjectException
+	 * @throws \CoreCannotSaveObjectException
 	 * @throws \CoreException
 	 * @throws \CoreUnexpectedValue
+	 * @throws \CoreWarning
+	 * @throws \MissingQueryArgument
 	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \OQLException
 	 */
-	protected function FindRecipients($sRecipAttCode, $aArgs, ?Trigger $oTrigger = null)
+	protected function FindRecipients($sRecipAttCode, $aArgs)
 	{
+		$oTrigger = $this->oCallingTrigger;
 		$sOQL = $this->Get($sRecipAttCode);
 		if (utils::IsNullOrEmptyString($sOQL)) return '';
 
@@ -505,6 +522,7 @@ class ActionEmail extends ActionNotification
 	 */
 	public function DoExecute($oTrigger, $aContextArgs)
 	{
+		parent::DoExecute($oTrigger, $aContextArgs);
 		if (MetaModel::IsLogEnabledNotification())
 		{
 			$oLog = new EventNotificationEmail();
@@ -587,7 +605,7 @@ class ActionEmail extends ActionNotification
 		
 		$oEmail = new EMail();
 		
-		$aEmailContent = $this->PrepareMessageContent($aContextArgs, $oLog, $oTrigger);
+		$aEmailContent = $this->PrepareMessageContent($aContextArgs, $oLog);
 		$oEmail->SetSubject($aEmailContent['subject']);
 		$oEmail->SetBody($aEmailContent['body'], 'text/html', $sStyles);
 		$oEmail->SetRecipientTO($aEmailContent['to']);
@@ -639,19 +657,22 @@ class ActionEmail extends ActionNotification
 	/**
 	 * @param array $aContextArgs
 	 * @param \EventNotification $oLog
-	 * @param \Trigger|null $oTrigger
 	 *
 	 * @return array
 	 * @throws \ArchivedObjectException
+	 * @throws \CoreCannotSaveObjectException
 	 * @throws \CoreException
 	 * @throws \CoreUnexpectedValue
+	 * @throws \CoreWarning
 	 * @throws \DictExceptionMissingString
 	 * @throws \DictExceptionUnknownLanguage
+	 * @throws \MissingQueryArgument
 	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 * @throws \OQLException
 	 * @since 3.1.0 N°918
-	 * @since 3.2.0 Added $oTrigger parameter
 	 */
-	protected function PrepareMessageContent($aContextArgs, &$oLog, ?Trigger $oTrigger = null): array
+	protected function PrepareMessageContent($aContextArgs, &$oLog): array
 	{
 		$aMessageContent = [
 			'to' => '',
@@ -678,9 +699,9 @@ class ActionEmail extends ActionNotification
 			
 			// Determine recipients
 			//
-			$aMessageContent['to'] = $this->FindRecipients('to', $aContextArgs, $oTrigger);
-			$aMessageContent['cc'] = $this->FindRecipients('cc', $aContextArgs, $oTrigger);
-			$aMessageContent['bcc'] = $this->FindRecipients('bcc', $aContextArgs, $oTrigger);
+			$aMessageContent['to'] = $this->FindRecipients('to', $aContextArgs);
+			$aMessageContent['cc'] = $this->FindRecipients('cc', $aContextArgs);
+			$aMessageContent['bcc'] = $this->FindRecipients('bcc', $aContextArgs);
 			
 			$aMessageContent['from'] = MetaModel::ApplyParams($this->Get('from'), $aContextArgs);
 			$aMessageContent['from_label'] = MetaModel::ApplyParams($this->Get('from_label'), $aContextArgs);

core/attributedef.class.inc.php

@@ -3062,6 +3062,11 @@ class AttributeObjectKey extends AttributeDBFieldVoid
 		return ((int) $proposedValue) !== 0;
 	}
 
+    /**
+     * @inheritDoc
+     *
+     * @param int|DBObject $proposedValue Object key or valid ({@see MetaModel::IsValidObject()}) datamodel object
+     */
 	public function MakeRealValue($proposedValue, $oHostObj)
 	{
 		if (is_null($proposedValue))
@@ -3074,7 +3079,6 @@ class AttributeObjectKey extends AttributeDBFieldVoid
 		}
 		if (MetaModel::IsValidObject($proposedValue))
 		{
-			/** @var \DBObject $proposedValue */
 			return $proposedValue->GetKey();
 		}
 
@@ -6511,6 +6515,11 @@ class AttributeDateTime extends AttributeDBField
 		}
 	}
 
+    /**
+     * @inheritDoc
+     *
+     * @param int|string $proposedValue timestamp ({@see DateTime::getTimestamp()) or date as string, following the {@see GetInternalFormat} format.
+     */
 	public function MakeRealValue($proposedValue, $oHostObj)
 	{
 		if (is_null($proposedValue))
@@ -8300,9 +8309,9 @@ class AttributeBlob extends AttributeDefinition
 	}
 
 	/**
-	 * Users can provide the document from an URL (including an URL on iTop itself)
-	 * for CSV import. Administrators can even provide the path to a local file
-	 * {@inheritDoc}
+     * {@inheritDoc}
+     *
+     * @param string $proposedValue Can be an URL (including an URL to iTop itself), or a local path (CSV import)
 	 *
 	 * @see AttributeDefinition::MakeRealValue()
 	 */

core/dbobject.class.php

@@ -608,11 +608,10 @@ abstract class DBObject implements iDisplay
      * Attributes setter
      *
      * Set $sAttCode to $value.
-     * The value must be valid according to the type of attribute.
+     * The value must be valid according to the type of attribute : see the different {@see AttributeDefinition::MakeRealValue()} implementations
      * The value will not be recorded into the DB until DBObject::DBWrite() is called.
      *
      * @api
-     * @see DBWrite()
      *
      * @param string $sAttCode
      * @param mixed $value
@@ -620,6 +619,8 @@ abstract class DBObject implements iDisplay
      * @return bool
      * @throws CoreException
      * @throws CoreUnexpectedValue
+     *
+     * @see DBWrite()
      */
 	public function Set($sAttCode, $value)
 	{

css/backoffice/components/_alert.scss

@@ -41,7 +41,7 @@ $ibo-alert-colors: (
 	$bg-color: nth($aColorValues, 1);
 	$highlight-color: nth($aColorValues, 2);
 	$text-color: nth($aColorValues, 3);
-	.ibo-alert.ibo-is-#{$sColor} {
+	%ibo-alert-#{$sColor}, .ibo-alert.ibo-is-#{$sColor} {
 		background-color: $bg-color;
 		color: $text-color;
     a {

css/backoffice/components/_toast.scss

@@ -48,15 +48,15 @@ $ibo-toast--max-width: calc(50% - 20px) !default;
     animation: none; /* Pause animation on hover */
   }
   &.ibo-is-error{
-    @extend .ibo-alert.ibo-is-danger;
+    @extend %ibo-alert-danger;
   }
   &.ibo-is-warning{
-    @extend .ibo-alert.ibo-is-warning;
+    @extend %ibo-alert-warning;
   }
   &.ibo-is-success{
-    @extend .ibo-alert.ibo-is-success;
+    @extend %ibo-alert-success;
   }
   &.ibo-is-information{
-    @extend .ibo-alert.ibo-is-information;
+    @extend %ibo-alert-information;
   }
 }