Merge pull request #39 from thijskh/feature/add-description-textarea

Allow to specify the description of all uploaded files.
ProfessionalWiki · Apr 11, 2021 · 05d5b08 · 05d5b08
2 parents 72eb608 + e6c6131
commit 05d5b08
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/res/ext.SimpleBatchUpload.js b/res/ext.SimpleBatchUpload.js
@@ -67,7 +67,7 @@
 					var src_filename = data.files[ 0 ].name;
 					var filenode_text = src_filename;
 					var dst_filename = src_filename
-					var textdata = $( that ).fileupload( 'option', 'text' );
+					var textdata = $("#wfUploadDescription").val();
                     // It matches: 
                     //   other| +rename = !(\w+)[ -_/]*! =$1-}} 
                     // where: 

diff --git a/src/ParameterProvider.php b/src/ParameterProvider.php
@@ -48,13 +48,13 @@ public function __construct( $templateName ) {
 		$this->templateName = $templateName ? $templateName : '';
 	}
 
-	public function getEscapedUploadPageText(): string {
+	public function getUploadPageText(): string {
 
 		if ( $this->templateName === '' ) {
 			return '';
 		}
 
-		return '{{' . $this->getEscapedParameter( self::IDX_TEMPLATENAME ) . $this->getEscapedParameter( self::IDX_TEMPLATEPARAMETERS ) . '}}';
+		return '{{' . $this->getParameter( self::IDX_TEMPLATENAME ) . $this->getParameter( self::IDX_TEMPLATEPARAMETERS ) . '}}';
 	}
 
 	private function getEscapedParameter( int $key ): string {

diff --git a/src/UploadButtonRenderer.php b/src/UploadButtonRenderer.php
@@ -25,7 +25,7 @@
 namespace SimpleBatchUpload;
 use Parser;
 use PPFrame;
-
+use Html;
 
 /**
  * Class UploadButtonRenderer
@@ -85,10 +85,14 @@ protected function renderUploadButton( $args, $output ) {
 	protected function getHtml( ParameterProvider $paramProvider ) {
 
 		$escapedUploadComment = $paramProvider->getEscapedUploadComment();
-		$escapedUploadPageText = $paramProvider->getEscapedUploadPageText();
+		$uploadPageText = $paramProvider->getUploadPageText();
 
 		return
 
+			'<label for="wfUploadDescription">' . \Message::newFromKey( 'upload-form-label-infoform-description' )->escaped() . ':</label><br>'.
+			'<span class="mw-input">' .
+			Html::element('textarea', ['name' => 'wfUploadDescription', 'id' => 'wfUploadDescription', 'cols' => '80', 'rows' => '8'], $uploadPageText) .
+			'</span><br> ' .
 			'<span class="fileupload-container"> ' .
 			'<span class="fileupload-dropzone fileinput-button"> ' .
 			'<i class="glyphicon glyphicon-plus"></i> ' .
@@ -97,7 +101,6 @@ protected function getHtml( ParameterProvider $paramProvider ) {
 			'<input class="fileupload" type="file" name="file" multiple ' .
 			'    data-url="' . wfScript( 'api' ) . '" ' .
 			'    data-comment="' . $escapedUploadComment . '" ' .
-			'    data-text="' . $escapedUploadPageText . '" ' .
 			'> ' .
 			'</span><ul class="fileupload-results"></ul> ' .
 			'</span>';