fix

jaesivsm · Oct 9, 2016 · 83933a1 · 83933a1
1 parent 59094ad
commit 83933a1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/web/controllers/cluster.py b/src/web/controllers/cluster.py
@@ -131,7 +131,8 @@ def join_read(self, feed_id=None, **filters):
                          .filter(cluster_has_feed)
         else:
             query = query.join(art_feed_alias,
-                               art_feed_alias.cluster_id == Cluster.id)
+                               and_(art_feed_alias.user_id == self.user_id,
+                                    art_feed_alias.cluster_id == Cluster.id))
         if filter_on_category:
             # joining only if filtering on categories to lighten the query
             # as every article doesn't obligatorily have a category > outerjoin

diff --git a/src/web/js/stores/MenuStore.js b/src/web/js/stores/MenuStore.js
@@ -40,9 +40,9 @@ var MenuStore = assign({}, EventEmitter.prototype, {
     readCluster: function(cluster, value) {
         cluster.feeds_id.map(function(feed_id) {
             this.feeds[feed_id].unread += value;
-        }.bind(this));
-        cluster.categories_id.map(function(category_id) {
-            this.categories[category_id].unread += value;
+            if(this.feeds[feed_id].category_id) {
+                this.categories[this.feeds[feed_id].category_id].unread += value;
+            }
         }.bind(this));
     },
     emitChange: function(all_folded) {

diff --git a/src/web/views/views.py b/src/web/views/views.py
@@ -13,7 +13,6 @@
 def authentication_required(error):
     if conf.API_ROOT in request.url:
         return error
-    flash(gettext('Authentication required.'), 'info')
     return redirect(url_for('login'))