Merge pull request #223 from mattermost/files-patch

Fixing file uploads and previews for new /team/ URL structure

3 files changed, 8 insertions, 2 deletions

diff --git a/web/react/components/file_preview.jsx b/web/react/components/file_preview.jsx
index 17a1e2bc2..553293d2b 100644
--- a/web/react/components/file_preview.jsx
+++ b/web/react/components/file_preview.jsx
@@ -19,6 +19,7 @@ module.exports = React.createClass({
             var filenameSplit = filename.split('.');
             var ext = filenameSplit[filenameSplit.length-1];
             var type = utils.getFileType(ext);
+            filename = window.location.origin + "/api/v1/files/get" + filename;
 
             if (type === "image") {
                 previews.push(
diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 96b441c0e..7871f52b7 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -29,7 +29,7 @@ module.exports = React.createClass({
                 var type = utils.getFileType(fileInfo.ext);
 
                 // This is a temporary patch to fix issue with old files using absolute paths
-                if (fileInfo.path.indexOf("/api/v1/files/get") == -1) {
+                if (fileInfo.path.indexOf("/api/v1/files/get") != -1) {
                     fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1];
                 }
                 fileInfo.path = window.location.origin + "/api/v1/files/get" + fileInfo.path;
@@ -109,7 +109,7 @@ module.exports = React.createClass({
                 var type = utils.getFileType(fileInfo.ext);
 
                 // This is a temporary patch to fix issue with old files using absolute paths
-                if (fileInfo.path.indexOf("/api/v1/files/get") == -1) {
+                if (fileInfo.path.indexOf("/api/v1/files/get") != -1) {
                     fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1];
                 }
                 fileInfo.path = window.location.origin + "/api/v1/files/get" + fileInfo.path;
diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx
index 2274f3f2e..4675269d5 100644
--- a/web/react/components/view_image.jsx
+++ b/web/react/components/view_image.jsx
@@ -36,6 +36,11 @@ module.exports = React.createClass({
             src = this.props.filenames[id];
         } else {
             var fileInfo = utils.splitFileLocation(this.props.filenames[id]);
+            // This is a temporary patch to fix issue with old files using absolute paths
+            if (fileInfo.path.indexOf("/api/v1/files/get") != -1) {
+                fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1];
+            }
+            fileInfo.path = window.location.origin + "/api/v1/files/get" + fileInfo.path;
             src = fileInfo['path'] + '_preview.jpg';
         }