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

2026-04-24 11:08:45 +02:00 · 2024-08-20 16:55:11 +02:00
parent 21c9332a7f ffb61503dc
commit a3f9eed6e2
12 changed files with 354 additions and 102 deletions
--- a/sources/Form/Field/FileUploadField.php
+++ b/sources/Form/Field/FileUploadField.php
@@ -30,6 +30,11 @@ class FileUploadField extends AbstractSimpleField
 {
 	/** @var bool DEFAULT_ALLOW_DELETE */
 	const DEFAULT_ALLOW_DELETE = true;
+	/**
+	  * @var bool DEFAULT_DISPLAY_OPENED
+	  * @since 3.2.1 N°7534
+	  */
+	const DEFAULT_DISPLAY_OPENED = false;

 	/** @var string|null $sTransactionId */
 	protected $sTransactionId;
@@ -39,8 +44,18 @@ class FileUploadField extends AbstractSimpleField
 	protected $sUploadEndpoint;
 	/** @var string|null $sDownloadEndpoint */
 	protected $sDownloadEndpoint;
+	/**
+	  * @var string|null $sViewEndpoint
+	  * @since 3.2.1 N°7534
+	  */
+	protected ?string $sDisplayEndpoint;
 	/** @var bool $bAllowDelete */
 	protected $bAllowDelete;
+	/**
+	  * @var bool $bDisplayOpened
+	  * @since 3.2.1 N°7534
+	  */
+	protected bool $bDisplayOpened;

 	/**
 	 * @inheritDoc
@@ -51,7 +66,9 @@ class FileUploadField extends AbstractSimpleField
 		$this->oObject = null;
 		$this->sUploadEndpoint = null;
 		$this->sDownloadEndpoint = null;
+		$this->sDisplayEndpoint = null;
 		$this->bAllowDelete = static::DEFAULT_ALLOW_DELETE;
+		$this->bDisplayOpened = static::DEFAULT_DISPLAY_OPENED;

 		parent::__construct($sId, $onFinalizeCallback);
 	}
@@ -134,6 +151,27 @@ class FileUploadField extends AbstractSimpleField
 		return $this;
 	}

+	/**
+	 * @return string|null
+	 * @since 3.2.1 N°7534
+	 */
+	public function GetDisplayEndpoint(): ?string
+	{
+		return $this->sDisplayEndpoint;
+	}
+
+	/**
+	 * @param string $sDisplayEndpoint
+	 *
+	 * @return FileUploadField
+	 * @since 3.2.1 N°7534
+	 */
+	public function SetDisplayEndpoint(string $sDisplayEndpoint): FileUploadField
+	{
+		$this->sDisplayEndpoint = $sDisplayEndpoint;
+		return $this;
+	}
+
 	/**
 	 * @return bool
 	 */
@@ -153,4 +191,29 @@ class FileUploadField extends AbstractSimpleField
 		return $this;
 	}

+	/**
+	 * Sets if the field should be displayed opened on initialization
+	 *
+	 * @param bool $bDisplayOpened
+	 *
+	 * @return FileUploadField
+	 * @since 3.2.1 N°7534
+	 */
+	public function SetDisplayOpened(bool $bDisplayOpened) : FileUploadField
+	{
+		$this->bDisplayOpened = $bDisplayOpened;
+
+		return $this;
+	}
+
+	/**
+	 * Returns if the field should be displayed opened on initialization
+	 *
+	 * @return boolean
+	 * @since 3.2.1 N°7534
+	 */
+	public function GetDisplayOpened() : bool
+	{
+		return $this->bDisplayOpened;
+	}
 }
--- a/sources/Renderer/Bootstrap/FieldRenderer/BsFileUploadFieldRenderer.php
+++ b/sources/Renderer/Bootstrap/FieldRenderer/BsFileUploadFieldRenderer.php
@@ -80,11 +80,17 @@ class BsFileUploadFieldRenderer extends BsFieldRenderer
 		$sFieldWrapperId = 'form_upload_wrapper_' . $this->oField->GetGlobalId();
 		$sFieldDescriptionForHTMLTag = ($this->oField->HasDescription()) ? 'data-tooltip-content="'.utils::HtmlEntities($this->oField->GetDescription()).'"' : '';

-		// If collapsed
-		$sCollapseTogglerClass .= ' collapsed';
-		$sCollapseTogglerExpanded = 'false';
-		$sCollapseTogglerIconClass = $sCollapseTogglerIconHiddenClass;
-		$sCollapseJSInitState = 'false';
+		// Preparing collapsed state
+		if ($this->oField->GetDisplayOpened()) {
+			$sCollapseTogglerExpanded = 'true';
+			$sCollapseTogglerIconClass = $sCollapseTogglerIconVisibleClass;
+			$sCollapseJSInitState = 'true';
+		} else {
+			$sCollapseTogglerClass .= ' collapsed';
+			$sCollapseTogglerExpanded = 'false';
+			$sCollapseTogglerIconClass = $sCollapseTogglerIconHiddenClass;
+			$sCollapseJSInitState = 'false';
+		}

 		// Label
 		$oOutput->AddHtml('<div class="form_field_label">');
@@ -183,6 +189,7 @@ JS
 			'{{iAttId}}',
 			'{{sLineStyle}}',
 			'{{sDocDownloadUrl}}',
+			'{{sDocDisplayUrl}}',
 		     true,
 			'{{sAttachmentThumbUrl}}',
 			'{{sFileName}}',
@@ -234,6 +241,7 @@ JS
 						var \$oAttachmentTBody = $(this).closest('.fileupload_field_content').find('.attachments_container table#$sAttachmentTableId>tbody'),
 							iAttId = data.result.att_id,
 							sDownloadLink = '{$this->oField->GetDownloadEndpoint()}'.replace(/-sAttachmentId-/, iAttId),
+							sDisplayLink = '{$this->oField->GetDisplayEndpoint()}'.replace(/-sAttachmentId-/, iAttId),
 							sAttachmentMeta = '<input id="attachment_'+iAttId+'" type="hidden" name="attachments[]" value="'+iAttId+'"/>';

 						// hide "no attachment" line if present
@@ -247,6 +255,7 @@ JS
 							{search: "{{iAttId}}", replace:iAttId },
 							{search: "{{lineStyle}}", replace:'' },
 							{search: "{{sDocDownloadUrl}}", replace:sDownloadLink },
+							{search: "{{sDocDisplayUrl}}", replace:sDisplayLink },
 							{search: "{{sAttachmentThumbUrl}}", replace:data.result.icon },
 							{search: "{{sFileName}}", replace: data.result.msg },
 							{search: "{{sAttachmentMeta}}", replace:sAttachmentMeta },
@@ -402,6 +411,7 @@ HTML
 				$sFileName = utils::EscapeHtml($oDoc->GetFileName());

 				$sDocDownloadUrl = str_replace('-sAttachmentId-', $iAttId, $this->oField->GetDownloadEndpoint());
+				$sDocDisplayUrl = str_replace('-sAttachmentId-', $iAttId, $this->oField->GetDisplayEndpoint());

 				$sAttachmentThumbUrl = utils::GetAbsoluteUrlAppRoot().AttachmentPlugIn::GetFileIcon($sFileName);
 				$bHasPreview = false;
@@ -431,6 +441,7 @@ HTML
 					$iAttId,
 					$sLineStyle,
 					$sDocDownloadUrl,
+					$sDocDisplayUrl,
 					$bHasPreview,
 					$sAttachmentThumbUrl,
 					$sFileName,
@@ -485,6 +496,7 @@ HTML;
 	 * @param int $iAttId
 	 * @param string $sLineStyle
 	 * @param string $sDocDownloadUrl
+	 * @param string $sDocDisplayUrl
 	 * @param bool $bHasPreview replace string $sIconClass since 3.0.1
 	 * @param string $sAttachmentThumbUrl
 	 * @param string $sFileName
@@ -499,7 +511,7 @@ HTML;
 	 * @since 2.7.0
 	 */
 	protected static function GetAttachmentTableRow(
-		$iAttId, $sLineStyle, $sDocDownloadUrl, $bHasPreview, $sAttachmentThumbUrl, $sFileName, $sAttachmentMeta, $sFileSize,
+		$iAttId, $sLineStyle, $sDocDownloadUrl, $sDocDisplayUrl, $bHasPreview, $sAttachmentThumbUrl, $sFileName, $sAttachmentMeta, $sFileSize,
 		$iFileSizeRaw, $iFileDownloadsCount, $sAttachmentDate, $iAttachmentDateRaw, $bIsDeleteAllowed
 	) {
 		$sDeleteCell = '';
@@ -511,16 +523,16 @@ HTML;
 		$sHtml =  "<tr id=\"display_attachment_{$iAttId}\" class=\"attachment\" $sLineStyle>";

 		if($bHasPreview) {
-			$sHtml .= "<td role=\"icon\"><a href=\"$sDocDownloadUrl\" target=\"_blank\" data-tooltip-content=\"<img class='attachment-tooltip' src='{$sDocDownloadUrl}'>\" data-tooltip-html-enabled=true><img src=\"$sAttachmentThumbUrl\" ></a></td>";
+			$sHtml .= "<td role=\"icon\"><a href=\"$sDocDisplayUrl\" target=\"_blank\" data-tooltip-content=\"<img class='attachment-tooltip' src='{$sDocDownloadUrl}'>\" data-tooltip-html-enabled=true><img src=\"$sAttachmentThumbUrl\" ></a></td>";
 		} else {
-			$sHtml .= "<td role=\"icon\"><a href=\"$sDocDownloadUrl\" target=\"_blank\"><img src=\"$sAttachmentThumbUrl\" ></a></td>";
+			$sHtml .= "<td role=\"icon\"><a href=\"$sDocDisplayUrl\" target=\"_blank\"><img src=\"$sAttachmentThumbUrl\" ></a></td>";
 		}

 		$sHtml .=  <<<HTML
-		<td role="filename"><a href="$sDocDownloadUrl" target="_blank">$sFileName</a>$sAttachmentMeta</td>
+		<td role="filename"><a href="$sDocDisplayUrl" target="_blank">$sFileName</a>$sAttachmentMeta</td>
 	    <td role="formatted-size" data-order="$iFileSizeRaw">$sFileSize</td>
 	    <td role="upload-date" data-order="$iAttachmentDateRaw">$sAttachmentDate</td>
-	    <td role="downloads-count">$iFileDownloadsCount</td>
+	    <td role="downloads-count"><a href="$sDocDownloadUrl" target="_blank"><span class="fas fa-download fa-lg" style="float: right;"></span></a>$iFileDownloadsCount</td>
 	    $sDeleteCell
 	</tr>
 HTML;
--- a/sources/Renderer/Bootstrap/FieldRenderer/BsSimpleFieldRenderer.php
+++ b/sources/Renderer/Bootstrap/FieldRenderer/BsSimpleFieldRenderer.php
@@ -254,7 +254,6 @@ JS
 							CombodoCKEditorHandler.GetInstance("#{$this->oField->GetGlobalId()}")
 								.then((oCKEditor) => {
 									oCKEditor.model.document.on("change:data", () => {
-										console.log("desc changed!");
 										const oFieldElem = $("#{$this->oField->GetGlobalId()}");
 										oFieldElem.closest(".field_set").trigger("field_change", {
 											id: oFieldElem.attr("id"),