From 456550a943004d9bd8d39748c6e824c5c08b3f8e Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 26 Apr 2020 11:34:10 +0200
Subject: [PATCH] Bugfix view shelfs on detiled page bugfix datetime in archive
 mode

---
 cps/templates/detail.html | 6 ++++--
 cps/web.py                | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index d2a15d7b..8315a8f2 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -234,7 +234,7 @@
           </button>
           <ul id="add-to-shelves" class="dropdown-menu" aria-labelledby="add-to-shelf">
             {% for shelf in g.shelves_access %}
-              {% if not shelf.id in books_shelfs %}
+              {% if not shelf.id in books_shelfs and ( not shelf.is_public or g.user.role_edit_shelfs() ) %}
                 <li>
                   <a href="{{ url_for('shelf.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
                      data-remove-href="{{ url_for('shelf.remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
@@ -255,7 +255,9 @@
                    data-add-href="{{ url_for('shelf.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
                    class="btn btn-sm btn-default" role="button" data-shelf-action="remove"
                 >
-                  <span class="glyphicon glyphicon-remove"></span> {{shelf.name}}
+                  <span {% if not shelf.is_public or g.user.role_edit_shelfs() %}
+                        class="glyphicon glyphicon-remove"
+                        {% endif %}></span> {{shelf.name}}
                 </a>
               {% endif %}
             {%endfor%}
diff --git a/cps/web.py b/cps/web.py
index e4f75cc7..fa668133 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -441,7 +441,7 @@ def toggle_archived(book_id):
                                                                   ub.ArchivedBook.book_id == book_id)).first()
     if archived_book:
         archived_book.is_archived = not archived_book.is_archived
-        archived_book.last_modified = datetime.datetime.utcnow()
+        archived_book.last_modified = datetime.utcnow()
     else:
         archived_book = ub.ArchivedBook(user_id=current_user.id, book_id=book_id)
         archived_book.is_archived = True