Fix #391

cps/templates/index.xml

@@ -41,13 +41,13 @@
     <id>{{url_for('feed_read_books')}}</id>
     <content type="text">{{_('Read Books')}}</content>
   </entry>
+{% endif %}
   <entry>
     <title>{{_('Unread Books')}}</title>
     <link rel="subsection" href="{{url_for('feed_unread_books')}}" type="application/atom+xml;profile=opds-catalog"/>
     <id>{{url_for('feed_unread_books')}}</id>
     <content type="text">{{_('Unread Books')}}</content>
   </entry>
-{% endif %}
   <entry>
     <title>{{_('Authors')}}</title>
     <link rel="subsection" href="{{url_for('feed_authorindex')}}" type="application/atom+xml;profile=opds-catalog"/>

cps/templates/layout.html

@@ -128,8 +128,10 @@
               <li><a href="{{url_for('best_rated_books')}}"><span class="glyphicon glyphicon-star"></span> {{_('Best rated Books')}}</a></li>
               {%endif%}
               {% if g.user.show_read_and_unread() %}
-              <li><a href="{{url_for('read_books')}}"><span class="glyphicon glyphicon-eye-open"></span> {{_('Read Books')}}</a></li>
+                {% if not g.user.is_anonymous %}
-              <li><a href="{{url_for('unread_books')}}"><span class="glyphicon glyphicon-eye-close"></span> {{_('Unread Books')}}</a></li>
+                  <li><a href="{{url_for('read_books')}}"><span class="glyphicon glyphicon-eye-open"></span> {{_('Read Books')}}</a></li>
+                {%endif%}
+                <li><a href="{{url_for('unread_books')}}"><span class="glyphicon glyphicon-eye-close"></span> {{_('Unread Books')}}</a></li>
               {%endif%}
               {% if g.user.show_random_books() %}
               <li id="nav_rand"><a href="{{url_for('discover')}}"><span class="glyphicon glyphicon-random"></span> {{_('Discover')}}</a></li>

cps/web.py

@@ -1757,20 +1757,15 @@ def feed_get_cover(book_id):
 
 
 def render_read_books(page, are_read, as_xml=False):
-    if not current_user.is_anonymous:
+    readBooks = ub.session.query(ub.ReadBook).filter(ub.ReadBook.user_id == int(current_user.id)).filter(ub.ReadBook.is_read == True).all()
-        readBooks = ub.session.query(ub.ReadBook).filter(ub.ReadBook.user_id == int(current_user.id)).filter(ub.ReadBook.is_read == True).all()
+    readBookIds = [x.book_id for x in readBooks]
-        readBookIds = [x.book_id for x in readBooks]
+    if are_read:
-        if are_read:
+        db_filter = db.Books.id.in_(readBookIds)
-            db_filter = db.Books.id.in_(readBookIds)
-        else:
-            db_filter = ~db.Books.id.in_(readBookIds)
-
-        entries, random, pagination = fill_indexpage(page, db.Books,
-            db_filter, db.Books.timestamp.desc())
     else:
-        entries = []
+        db_filter = ~db.Books.id.in_(readBookIds)
-        random = False
+
-        pagination = Pagination(page, 1, 0)
+    entries, random, pagination = fill_indexpage(page, db.Books,
+        db_filter, db.Books.timestamp.desc())
 
     if as_xml:
         xml = render_title_template('feed.xml', entries=entries, pagination=pagination)