From 055fcbc0ea058a42d3232c7cea99b9df92a5e9b4 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Thu, 17 Nov 2016 11:37:10 -0800 Subject: [PATCH] Fixing notifications dialog bug. --- config/requirements.txt | 2 +- fabfile.py | 2 +- media/js/newsblur/reader/reader_notifications.js | 2 +- utils/backups/s3.py | 9 +++++---- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/config/requirements.txt b/config/requirements.txt index 16732b3c4..bd174e021 100755 --- a/config/requirements.txt +++ b/config/requirements.txt @@ -1,6 +1,6 @@ # pysqlite==2.6.0 BeautifulSoup==3.2.1 -boto==2.8.0 +boto==2.43.0 celery==3.1.23 chardet==2.1.1 cssutils==0.9.10b1 diff --git a/fabfile.py b/fabfile.py index c3af0e3d5..5910adacd 100644 --- a/fabfile.py +++ b/fabfile.py @@ -1528,7 +1528,7 @@ def kill_celery(): run('./utils/kill_celery.sh') def compress_assets(bundle=False): - local('jammit -c assets.yml --base-url http://www.newsblur.com --output static') + local('jammit -c assets.yml --base-url https://www.newsblur.com --output static') local('tar -czf static.tgz static/*') tries_left = 5 diff --git a/media/js/newsblur/reader/reader_notifications.js b/media/js/newsblur/reader/reader_notifications.js index e46756597..7fb8417b5 100644 --- a/media/js/newsblur/reader/reader_notifications.js +++ b/media/js/newsblur/reader/reader_notifications.js @@ -114,7 +114,7 @@ _.extend(NEWSBLUR.ReaderNotifications.prototype, { }, make_feed_notifications: function() { - var site_feed_id = this.feed.id; + var site_feed_id = this.feed && this.feed.id; var notifications = this.model.get_feeds().select(function(feed) { return feed.get('notification_types') && feed.id != site_feed_id; }); diff --git a/utils/backups/s3.py b/utils/backups/s3.py index cc3f76a13..b95e2e12a 100644 --- a/utils/backups/s3.py +++ b/utils/backups/s3.py @@ -1,4 +1,5 @@ from boto.s3.connection import S3Connection +from boto.s3.connection import OrdinaryCallingFormat from boto.s3.key import Key import os import sys @@ -14,7 +15,7 @@ SECRET = settings.S3_SECRET BUCKET_NAME = settings.S3_BACKUP_BUCKET # Note that you need to create this bucket first def save_file_in_s3(filename, name=None): - conn = S3Connection(ACCESS_KEY, SECRET) + conn = S3Connection(ACCESS_KEY, SECRET, calling_format=OrdinaryCallingFormat()) bucket = conn.get_bucket(BUCKET_NAME) k = Key(bucket) k.key = name or filename @@ -22,7 +23,7 @@ def save_file_in_s3(filename, name=None): k.set_contents_from_filename(filename) def get_file_from_s3(filename): - conn = S3Connection(ACCESS_KEY, SECRET) + conn = S3Connection(ACCESS_KEY, SECRET, calling_format=OrdinaryCallingFormat()) bucket = conn.get_bucket(BUCKET_NAME) k = Key(bucket) k.key = filename @@ -30,7 +31,7 @@ def get_file_from_s3(filename): k.get_contents_to_filename(filename) def list_backup_in_s3(): - conn = S3Connection(ACCESS_KEY, SECRET) + conn = S3Connection(ACCESS_KEY, SECRET, calling_format=OrdinaryCallingFormat()) bucket = conn.get_bucket(BUCKET_NAME) for i, key in enumerate(bucket.get_all_keys()): @@ -38,7 +39,7 @@ def list_backup_in_s3(): def delete_all_backups(): #FIXME: validate filename exists - conn = S3Connection(ACCESS_KEY, SECRET) + conn = S3Connection(ACCESS_KEY, SECRET, calling_format=OrdinaryCallingFormat()) bucket = conn.get_bucket(BUCKET_NAME) for i, key in enumerate(bucket.get_all_keys()):