Browse Source

Change to relative path and /var/attachments to store

Romulus Urakagi Tsai 5 years ago
parent
commit
d26bf04bfa

+ 2 - 2
client/components/cards/attachments.js

@@ -47,7 +47,7 @@ Template.attachmentsGalery.events({
 
 Template.attachmentsGalery.helpers({
   url() {
-    return Attachments.link(this); 
+    return Attachments.link(this, 'original', '/'); 
   },
   isUploaded() {
     return !!this.meta.uploaded;
@@ -62,7 +62,7 @@ Template.previewAttachedImagePopup.events({
 
 Template.previewAttachedImagePopup.helpers({
   url() {
-    return Attachments.link(this);
+    return Attachments.link(this, 'original', '/');
   }
 });
 

+ 1 - 1
client/components/cards/minicard.js

@@ -33,6 +33,6 @@ Template.minicard.helpers({
     return Meteor.user().hasHiddenMinicardLabelText();
   },
   coverUrl() {
-    return Attachments.findOne(this.coverId).link();
+    return Attachments.findOne(this.coverId).link('original', '/');
   },
 });

+ 24 - 23
client/components/main/editor.js

@@ -225,32 +225,33 @@ Template.editor.onRendered(() => {
                   $summernote.summernote('insertNode', img);
                 };
                 const processData = function(fileObj) {
-                  // FIXME: Change to new API
                   Utils.processUploadedAttachment(
                     currentCard,
-                    fileObj,
-                    attachment => {
-                      if (attachment && attachment._id && attachment.isImage) {
-                        attachment.one('uploaded', function() {
-                          const maxTry = 3;
-                          const checkItvl = 500;
-                          let retry = 0;
-                          const checkUrl = function() {
-                            // even though uploaded event fired, attachment.url() is still null somehow //TODO
-                            const url = attachment.link();
-                            if (url) {
-                              insertImage(
-                                `${location.protocol}//${location.host}${url}`,
-                              );
-                            } else {
-                              retry++;
-                              if (retry < maxTry) {
-                                setTimeout(checkUrl, checkItvl);
+                    fileObj, 
+                    { onUploaded:
+                      attachment => {
+                        if (attachment && attachment._id && attachment.isImage) {
+                          attachment.one('uploaded', function() {
+                            const maxTry = 3;
+                            const checkItvl = 500;
+                            let retry = 0;
+                            const checkUrl = function() {
+                              // even though uploaded event fired, attachment.url() is still null somehow //TODO
+                              const url = Attachments.link(attachment, 'original', '/');
+                              if (url) {
+                                insertImage(
+                                  `${location.protocol}//${location.host}${url}`,
+                                );
+                              } else {
+                                retry++;
+                                if (retry < maxTry) {
+                                  setTimeout(checkUrl, checkItvl);
+                                }
                               }
-                            }
-                          };
-                          checkUrl();
-                        });
+                            };
+                            checkUrl();
+                          });
+                        }
                       }
                     },
                   );

+ 2 - 0
models/attachments.js

@@ -291,6 +291,8 @@ if (Meteor.isServer) {
 }
 
 function storagePath(defaultPath) {
+  // FIXME
+  return '/var/attachments';
   const storePath = process.env.ATTACHMENTS_STORE_PATH;
   return storePath ? storePath : defaultPath;
 }

+ 2 - 1
sandstorm-pkgdef.capnp

@@ -257,6 +257,7 @@ const myCommand :Spk.Manifest.Command = (
     (key = "OAUTH2_TOKEN_ENDPOINT", value=""),
     (key = "LDAP_ENABLE", value="false"),
     (key = "SANDSTORM", value="1"),
-    (key = "METEOR_SETTINGS", value = "{\"public\": {\"sandstorm\": true}}")
+    (key = "METEOR_SETTINGS", value = "{\"public\": {\"sandstorm\": true}}"),
+    (key = "ATTACHMENTS_STORE_PATH", value = "/var/attachments/")
   ]
 );