diff --git a/apps/reader/models.py b/apps/reader/models.py index 2a082ef07..a89a0206d 100644 --- a/apps/reader/models.py +++ b/apps/reader/models.py @@ -42,6 +42,9 @@ class UserSubscription(models.Model): def __unicode__(self): return '[' + self.feed.feed_title + '] ' + + class Meta: + unique_together = ("user", "feed") def canonical(self, full=False, include_favicon=True, classifiers=None): feed = self.feed.canonical(full=full, include_favicon=include_favicon) @@ -361,9 +364,6 @@ class UserSubscription(models.Model): switch_feed_for_classifier(MClassifierFeed) switch_feed_for_classifier(MClassifierTag) - class Meta: - unique_together = ("user", "feed") - class MUserStory(mongo.Document): """ diff --git a/media/js/newsblur/common/router.js b/media/js/newsblur/common/router.js index b26856d2e..f7b6ea5e8 100644 --- a/media/js/newsblur/common/router.js +++ b/media/js/newsblur/common/router.js @@ -9,7 +9,9 @@ NEWSBLUR.Router = Backbone.Router.extend({ "user/*user": "user" }, - index: function() {}, + index: function() { + NEWSBLUR.reader.show_splash_page(); + }, add_site: function() { console.log(["add", window.location, $.getQueryString('url')]); diff --git a/media/js/newsblur/reader/reader.js b/media/js/newsblur/reader/reader.js index 11332dd42..3580bfe7d 100644 --- a/media/js/newsblur/reader/reader.js +++ b/media/js/newsblur/reader/reader.js @@ -351,7 +351,7 @@ } }, - show_splash_page: function() { + show_splash_page: function(skip_router) { this.reset_feed(); this.unload_feed_iframe(); this.unload_story_iframe(); @@ -361,6 +361,10 @@ $('#NB-splash').show(); $('#NB-splash-overlay').show(); this.$s.$dashboard.removeClass('NB-active'); + if (!skip_router) { + NEWSBLUR.router.navigate(''); + } + }, iframe_buster_buster: function() {