[Wiki] Fix actions not showing in some desirable cases

4 files changed, 6 insertions, 6 deletions

diff --git a/pysite/views/wiki/delete.py b/pysite/views/wiki/delete.py
index 4c88a955..38d7d087 100644
--- a/pysite/views/wiki/delete.py
+++ b/pysite/views/wiki/delete.py
@@ -28,7 +28,7 @@ class DeleteView(RouteView, DBMixin):
                 if datetime.datetime.utcnow() < lock_time:
                     return self.render("wiki/page_in_use.html", page=page)
 
-            return self.render("wiki/page_delete.html", page=page, title=title)
+            return self.render("wiki/page_delete.html", page=page, title=title, can_edit=True)
         else:
             raise NotFound()
 
diff --git a/pysite/views/wiki/edit.py b/pysite/views/wiki/edit.py
index 3622f927..f6f61272 100644
--- a/pysite/views/wiki/edit.py
+++ b/pysite/views/wiki/edit.py
@@ -38,7 +38,7 @@ class EditView(RouteView, DBMixin):
             if obj.get("lock_expiry") and obj.get("lock_user") != self.user_data.get("user_id"):
                 lock_time = datetime.datetime.fromtimestamp(obj["lock_expiry"])
                 if datetime.datetime.utcnow() < lock_time:
-                    return self.render("wiki/page_in_use.html", page=page)
+                    return self.render("wiki/page_in_use.html", page=page, can_edit=True)
 
         lock_expiry = datetime.datetime.utcnow() + datetime.timedelta(minutes=5)
 
@@ -53,7 +53,7 @@ class EditView(RouteView, DBMixin):
                 conflict="update"
             )
 
-        return self.render("wiki/page_edit.html", page=page, rst=rst, title=title, preview=preview)
+        return self.render("wiki/page_edit.html", page=page, rst=rst, title=title, preview=preview, can_edit=True)
 
     @require_roles(*EDITOR_ROLES)
     @csrf
diff --git a/pysite/views/wiki/move.py b/pysite/views/wiki/move.py
index 9f898c43..93ce8805 100644
--- a/pysite/views/wiki/move.py
+++ b/pysite/views/wiki/move.py
@@ -26,9 +26,9 @@ class MoveView(RouteView, DBMixin):
             if obj.get("lock_expiry") and obj.get("lock_user") != self.user_data.get("user_id"):
                 lock_time = datetime.datetime.fromtimestamp(obj["lock_expiry"])
                 if datetime.datetime.utcnow() < lock_time:
-                    return self.render("wiki/page_in_use.html", page=page)
+                    return self.render("wiki/page_in_use.html", page=page, can_edit=True)
 
-            return self.render("wiki/page_move.html", page=page, title=title)
+            return self.render("wiki/page_move.html", page=page, title=title, can_edit=True)
         else:
             raise NotFound()
 
diff --git a/templates/wiki/base.html b/templates/wiki/base.html
index 316e3d22..73b0f47c 100644
--- a/templates/wiki/base.html
+++ b/templates/wiki/base.html
@@ -77,7 +77,7 @@
                                 "wiki.history.compare", "wiki.source", "wiki.delete",
                                 "wiki.move"
                         ] %}
-                        {% set actionable = can_edit and current_page in ACTIONABLE_PAGES %}
+                        {% set actionable = current_page in ACTIONABLE_PAGES and can_edit %}
 
                         {% if actionable %}
                             <li class="uk-nav-divider"></li>