fix post output settings for qa admin

USStateDept · Aug 17, 2015 · 74494e2 · 74494e2
1 parent 13b4d9a
commit 74494e2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/openspending/admin/helpers.py b/openspending/admin/helpers.py
@@ -78,23 +78,23 @@ def _write_loaded_data(self):
 
         url = "/api/slicer/cube/geometry/cubes_aggregate?cubes=" + self.dataset.name + "&drilldown=geometry__time|geometry__country_level0@name&format=csv"
 
-        # Fill in your details here to be posted to the login form.
-        LOCKDOWN_FORCE = current_app.config.get("LOCKDOWNUSER", False)
-        LOCKDOWNUSER = current_app.config.get("LOCKDOWNUSER")
-        LOCKDOWNPASSWORD = current_app.config.get("LOCKDOWNUSER")
-        if LOCKDOWN_FORCE:
-            payload = {
-                'username': LOCKDOWNUSER,
-                'password': LOCKDOWNPASSWORD
-            }
-
-            client.post(url_for('home.lockdown'), data=payload)
-
-        print client
-        try:
-            postloadvalue = client.get(url).data
-        except Exception, e:
-            log.warn("Could Not find post load content for " + dataset.name)
+        with client:
+            # Fill in your details here to be posted to the login form.
+            LOCKDOWN_FORCE = current_app.config.get("LOCKDOWN_FORCE", False)
+            LOCKDOWNUSER = current_app.config.get("LOCKDOWNUSER")
+            LOCKDOWNPASSWORD = current_app.config.get("LOCKDOWNPASSWORD")
+            if LOCKDOWN_FORCE:
+                payload = {
+                    'username': LOCKDOWNUSER,
+                    'password': LOCKDOWNPASSWORD
+                }
+
+                client.post(url_for('home.lockdown'), data=payload, follow_redirects=True)
+
+            try:
+                postloadvalue = client.get(url, follow_redirects=True).data
+            except Exception, e:
+                log.warn("Could Not find post load content for " + dataset.name)
 
         try:
             self.zf.writestr("postloadvalue.csv", postloadvalue)

diff --git a/settings.py_tmpl b/settings.py_tmpl
@@ -50,7 +50,7 @@ UPLOADS_FOLDER = os.path.realpath('.') + '/datauploads/'
 FILE_SYSTEM_STORAGE_FILE_VIEW = 'static'
 
 #UploadSet Flask-uploads management of files
-UPLOADED_FILES_DEST = os.path.realpath('.') + '/datauploads/'
+UPLOADS_DEFAULT_DEST = os.path.realpath('.') + '/datauploads/'
 
 #domain whitelist 
 EMAIL_WHITELIST = ['state.gov', 'whitehouse.gov']