From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 22 May 2014 18:18:45 +0000 (+0200)
Subject: Added ability to sort attachments by drag&drop
X-Git-Tag: 2.1.0_Alpha_1~808^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ebe4194f3d148a05b2a0f3aa069c8ffbc365888b;p=GitHub%2FWoltLab%2FWCF.git

Added ability to sort attachments by drag&drop
---

diff --git a/com.woltlab.wcf/templates/messageFormAttachments.tpl b/com.woltlab.wcf/templates/messageFormAttachments.tpl
index 295386fa39..9ca15aa366 100644
--- a/com.woltlab.wcf/templates/messageFormAttachments.tpl
+++ b/com.woltlab.wcf/templates/messageFormAttachments.tpl
@@ -1,7 +1,7 @@
 <div id="attachments" class="jsOnly formAttachmentContent tabMenuContent container containerPadding">
 	<ul class="formAttachmentList clearfix"{if !$attachmentHandler->getAttachmentList()|count} style="display: none"{/if}>
 		{foreach from=$attachmentHandler->getAttachmentList() item=$attachment}
-			<li class="box48">
+			<li class="box48" data-object-id="{@$attachment->attachmentID}">
 				{if $attachment->tinyThumbnailType}
 					<img src="{link controller='Attachment' object=$attachment}tiny=1{/link}" alt="" class="attachmentTinyThumbnail" />
 				{else}
diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wupload.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wupload.js
index 2ba974dcb0..efb570b1e1 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wupload.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wupload.js
@@ -37,7 +37,7 @@ RedactorPlugins.wupload = {
 		if ($options.attachments.length) {
 			for (var $i = 0; $i < $options.attachments.length; $i++) {
 				var $attachment = $options.attachments[$i];
-				var $listItem = $('<li class="box48" />');
+				var $listItem = $('<li class="box48" />').data('objectID', $attachment.attachmentID);
 				if ($attachment.tinyThumbnailUrl) {
 					$('<img src="' + $attachment.tinyThumbnailUrl + '" alt="" class="attachmentTinyThumbnail" />').appendTo($listItem);
 				}
diff --git a/wcfsetup/install/files/js/WCF.Attachment.js b/wcfsetup/install/files/js/WCF.Attachment.js
index 9b05e28629..1e8bbd84f0 100644
--- a/wcfsetup/install/files/js/WCF.Attachment.js
+++ b/wcfsetup/install/files/js/WCF.Attachment.js
@@ -55,6 +55,8 @@ WCF.Attachment.Upload = WCF.Upload.extend({
 		this._fileListSelector.find('.jsButtonInsertAttachment').click($.proxy(this._insert, this));
 		
 		WCF.DOMNodeRemovedHandler.addCallback('WCF.Attachment.Upload', $.proxy(this._removeLimitError, this));
+		
+		this._makeSortable();
 	},
 	
 	/**
@@ -200,6 +202,8 @@ WCF.Attachment.Upload = WCF.Upload.extend({
 				var $deleteButton = $('<li><span class="icon icon16 icon-remove pointer jsTooltip jsDeleteButton" title="'+WCF.Language.get('wcf.global.button.delete')+'" data-object-id="'+data.returnValues.attachments[$internalFileID]['attachmentID']+'" data-confirm-message="'+WCF.Language.get('wcf.attachment.delete.sure')+'" /></li>');
 				$li.find('ul').append($deleteButton);
 				
+				$li.data('objectID', data.returnValues.attachments[$internalFileID].attachmentID);
+				
 				if (this._wysiwygContainerID) {
 					var $insertButton = $('<li><span class="icon icon16 icon-paste pointer jsTooltip jsButtonInsertAttachment" title="' + WCF.Language.get('wcf.attachment.insert') + '" data-object-id="' + data.returnValues.attachments[$internalFileID]['attachmentID'] + '" /></li>');
 					$insertButton.children('.jsButtonInsertAttachment').click($.proxy(this._insert, this));
@@ -228,6 +232,8 @@ WCF.Attachment.Upload = WCF.Upload.extend({
 			$li.css('display', 'block');
 		}
 		
+		this._makeSortable();
+		
 		WCF.DOMNodeInsertedHandler.execute();
 	},
 	
@@ -272,5 +278,50 @@ WCF.Attachment.Upload = WCF.Upload.extend({
 				$listItem.find('div > div').append($('<small class="innerError">' + (data.responseJSON && data.responseJSON.message ? data.responseJSON.message : WCF.Language.get('wcf.attachment.upload.error.uploadFailed')) + '</small>'));
 			}
 		});
+	},
+	
+	/**
+	 * Initializes sorting for uploaded attachments.
+	 */
+	_makeSortable: function() {
+		var $attachments = this._fileListSelector.children('li:not(.uploadFailed)');
+		if (!$attachments.length) {
+			return;
+		}
+		
+		$attachments.addClass('sortableAttachment').children('img').addClass('sortableNode');
+		
+		if (!this._fileListSelector.hasClass('sortableList')) {
+			this._fileListSelector.addClass('sortableList');
+			
+			var self = this;
+			new WCF.Sortable.List(this._fileListSelector.parent().wcfIdentify(), '', 0, {
+				axis: false,
+				items: 'li.sortableAttachment',
+				toleranceElement: null,
+				update: function(event, ui) {
+					var $attachmentIDs = [ ];
+					self._fileListSelector.children('li:not(.uploadFailed)').each(function(index, listItem) {
+						$attachmentIDs.push($(listItem).data('objectID'));
+					});
+					
+					if ($attachmentIDs.length) {
+						new WCF.Action.Proxy({
+							autoSend: true,
+							data: {
+								actionName: 'updatePosition',
+								className: 'wcf\\data\\attachment\\AttachmentAction',
+								parameters: {
+									attachmentIDs: $attachmentIDs,
+									objectID: self._objectID,
+									objectType: self._objectType,
+									tmpHash: self._tmpHash
+								}
+							}
+						});
+					}
+				}
+			}, true);
+		}
 	}
 });
diff --git a/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php b/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php
index 6a2bae9e1a..b5b5e48422 100644
--- a/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php
+++ b/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php
@@ -11,6 +11,8 @@ use wcf\system\request\LinkHandler;
 use wcf\system\upload\DefaultUploadFileValidationStrategy;
 use wcf\system\WCF;
 use wcf\util\FileUtil;
+use wcf\util\ArrayUtil;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
 
 /**
  * Executes attachment-related actions.
@@ -315,4 +317,84 @@ class AttachmentAction extends AbstractDatabaseObjectAction {
 			}
 		}
 	}
+	
+	/**
+	 * Validates parameters to update the attachments show order.
+	 */
+	public function validateUpdatePosition() {
+		$this->readInteger('objectID', true);
+		$this->readString('objectType');
+		$this->readString('tmpHash', true);
+		
+		if (empty($this->parameters['objectID']) && empty($this->parameters['tmpHash'])) {
+			throw new UserInputException('objectID');
+		}
+		
+		// validate object type
+		$objectType = ObjectTypeCache::getInstance()->getObjectTypeByName('com.woltlab.wcf.attachment.objectType', $this->parameters['objectType']);
+		if ($objectType === null) {
+			throw new UserInputException('objectType');
+		}
+		
+		if (!empty($this->parameters['objectID'])) {
+			// check upload permissions
+			if (!$objectType->getProcessor()->canUpload($this->parameters['objectID'])) {
+				throw new PermissionDeniedException();
+			}
+		}
+		
+		if (!isset($this->parameters['attachmentIDs']) || !is_array($this->parameters['attachmentIDs'])) {
+			throw new UserInputException('attachmentIDs');
+		}
+		
+		$this->parameters['attachmentIDs'] = ArrayUtil::toIntegerArray($this->parameters['attachmentIDs']);
+		
+		// check attachment ids
+		$attachmentIDs = array();
+		$conditions = new PreparedStatementConditionBuilder();
+		$conditions->add("attachmentID IN (?)", array($this->parameters['attachmentIDs']));
+		$conditions->add("objectTypeID = ?", array($objectType->objectTypeID));
+		
+		if (!empty($this->parameters['objectID'])) {
+			$conditions->add("objectID = ?", array($this->parameters['objectID']));
+		}
+		else {
+			$conditions->add("tmpHash = ?", array($this->parameters['tmpHash']));
+		}
+		
+		$sql = "SELECT	attachmentID
+			FROM	wcf".WCF_N."_attachment
+			".$conditions;
+		$statement = WCF::getDB()->prepareStatement($sql);
+		$statement->execute($conditions->getParameters());
+		while ($row = $statement->fetchArray()) {
+			$attachmentIDs[] = $row['attachmentID'];
+		}
+		
+		foreach ($this->parameters['attachmentIDs'] as $attachmentID) {
+			if (!in_array($attachmentID, $attachmentIDs)) {
+				throw new UserInputException('attachmentIDs');
+			}
+		}
+	}
+	
+	/**
+	 * Updates the attachments show order.
+	 */
+	public function updatePosition() {
+		$sql = "UPDATE	wcf".WCF_N."_attachment
+			SET	showOrder = ?
+			WHERE	attachmentID = ?";
+		$statement = WCF::getDB()->prepareStatement($sql);
+		
+		WCF::getDB()->beginTransaction();
+		$showOrder = 1;
+		foreach ($this->parameters['attachmentIDs'] as $attachmentID) {
+			$statement->execute(array(
+				$showOrder++,
+				$attachmentID
+			));
+		}
+		WCF::getDB()->commitTransaction();
+	}
 }