Merge branch 'hotfix/0.21.2' into develop

bnosek · Nov 20, 2014 · 6089b7a · 6089b7a
2 parents e357f09 + 4c20cd8
commit 6089b7a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/website/app.py b/website/app.py
@@ -3,6 +3,7 @@
 import importlib
 
 from modularodm import storage
+from werkzeug.contrib.fixers import ProxyFix
 
 import framework
 from framework.flask import app, add_handlers
@@ -109,4 +110,12 @@ def init_app(settings_module='website.settings', set_backends=True, routes=True)
 
     if set_backends:
         ensure_schemas()
+    apply_middlewares(app, settings)
     return app
+
+def apply_middlewares(flask_app, settings):
+    # Use ProxyFix to respect X-Forwarded-Proto header
+    # https://stackoverflow.com/questions/23347387/x-forwarded-proto-and-flask
+    if settings.LOAD_BALANCER:
+        flask_app.wsgi_app = ProxyFix(flask_app.wsgi_app)
+    return flask_app
diff --git a/website/settings/defaults.py b/website/settings/defaults.py
@@ -19,6 +19,8 @@ def parent_dir(path):
 STATIC_FOLDER = os.path.join(BASE_PATH, 'static')
 STATIC_URL_PATH = "/static"
 
+LOAD_BALANCER = False
+
 LOG_PATH = os.path.join(APP_PATH, 'logs')
 TEMPLATES_PATH = os.path.join(BASE_PATH, 'templates')
 ANALYTICS_PATH = os.path.join(BASE_PATH, 'analytics')

diff --git a/website/static/js/search.js b/website/static/js/search.js
@@ -48,7 +48,7 @@
         self.filesUrl = result.url+'files/';
         self.user = result.user;
 
-        $.ajax('/api/v1'+ result.url + '/').success(function(data){
+        $.ajax('/api/v1'+ result.url).success(function(data){
             if (typeof data.profile !== 'undefined') {
                 self.gravatarUrl(data.profile.gravatar_url);
             }