Fix for deleting books in shelfs (#419)

cps/web.py

@@ -2194,13 +2194,14 @@ def remove_from_shelf(shelf_id, book_id):
 
     # if shelf is public and use is allowed to edit shelfs, or if shelf is private and user is owner
     # allow editing shelfs
-    if (not shelf.is_public and not shelf.user_id == int(current_user.id)) \
+    # result   shelf public   user allowed    user owner
-            or not (shelf.is_public and current_user.role_edit_shelfs()):
+    #   false        1             0             x
-        if not request.is_xhr:
+    #   true         1             1             x
-            app.logger.info("Sorry you are not allowed to remove a book from this shelf: %s" % shelf.name)
+    #   true         0             x             1
-            return redirect(url_for('index'))
+    #   false        0             x             0
-        return "Sorry you are not allowed to add a book to the the shelf: %s" % shelf.name, 403
+
-
+    if (not shelf.is_public and shelf.user_id == int(current_user.id)) \
+            or (shelf.is_public and current_user.role_edit_shelfs()):
         book_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id,
                                                            ub.BookShelf.book_id == book_id).first()
 
@@ -2217,6 +2218,13 @@ def remove_from_shelf(shelf_id, book_id):
             flash(_(u"Book has been removed from shelf: %(sname)s", sname=shelf.name), category="success")
             return redirect(request.environ["HTTP_REFERER"])
         return "", 204
+    else:
+        app.logger.info("Sorry you are not allowed to remove a book from this shelf: %s" % shelf.name)
+        if not request.is_xhr:
+            flash(_(u"Sorry you are not allowed to remove a book from this shelf: %(sname)s", sname=shelf.name), category="error")
+            return redirect(url_for('index'))
+        return "Sorry you are not allowed to remove a book from this shelf: %s" % shelf.name, 403
+
 
 
 @app.route("/shelf/create", methods=["GET", "POST"])