Merge branch 'dev' of dev.quiqqer.com:quiqqer/erp into dev

bin/backend/controls/OutputMailEditor.css

@@ -29,4 +29,5 @@
 .quiqqer-erp-outputMailEditor-attachments {
     display: none;
     padding: 10px 0 0 10px;
+    width: 300px;
 }
\ No newline at end of file

bin/backend/controls/OutputMailEditor.js

@@ -150,6 +150,29 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
                     );
                 }
 
+                var mediaFilesAdded = false;
+
+                var addMediaFiles = function () {
+                    if (mediaFilesAdded) {
+                        return;
+                    }
+
+                    mediaFilesAdded = true;
+
+                    // Add previously selected media items
+                    if (self.getAttribute('attachedMediaFileIds') && hasAttachmentPermission) {
+                        var mediaIds = self.getAttribute('attachedMediaFileIds');
+
+                        if (mediaIds.length) {
+                            for (var i = 0, len = mediaIds.length; i < len; i++) {
+                                self.$Attachments.addItem(mediaIds[i]);
+                            }
+
+                            AttachmentBtn.click();
+                        }
+                    }
+                };
+
                 require(['Editors'], function (Editors) {
                     Editors.getEditor().then(function (Editor) {
                         Editor.addEvent('onLoaded', function () {
@@ -158,18 +181,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
 
                             Editor.resize();
 
-                            // Add previously selected media items
-                            if (self.getAttribute('attachedMediaFileIds') && hasAttachmentPermission) {
-                                var mediaIds = self.getAttribute('attachedMediaFileIds');
-
-                                if (mediaIds.length) {
-                                    for (var i = 0, len = mediaIds.length; i < len; i++) {
-                                        self.$Attachments.addItem(mediaIds[i]);
-                                    }
-
-                                    AttachmentBtn.click();
-                                }
-                            }
+                            addMediaFiles();
                         });
 
                         Editor.inject(
@@ -204,11 +216,19 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
                 mediaIds = this.$Attachments.getValue().split(',');
             }
 
+            var uniqueMediaIds = [];
+
+            for (var i = 0, len = mediaIds.length; i < len; i++) {
+                if (!uniqueMediaIds.contains(mediaIds[i])) {
+                    uniqueMediaIds.push(mediaIds[i]);
+                }
+            }
+
             this.fireEvent('mailSubmit', [
                 {
                     subject             : this.$MailSubjectInput.value,
                     content             : this.$MailContentEditor.getContent(),
-                    attachedMediaFileIds: mediaIds
+                    attachedMediaFileIds: uniqueMediaIds
                 },
                 this
             ]);