diff options
author | 2018-06-03 13:11:30 +0100 | |
---|---|---|
committer | 2018-06-03 13:11:51 +0100 | |
commit | 6f87babab687b8a8caeedc4c2d4d3932ab59b782 (patch) | |
tree | 8d1664f843bf3b8e92e65ac0448a0d42dfab56f5 /pysite | |
parent | [Wiki] Prefer horizontal whitespace over vertical (#85) (diff) |
[Wiki] Fix actions not showing in some desirable cases
Diffstat (limited to 'pysite')
-rw-r--r-- | pysite/views/wiki/delete.py | 2 | ||||
-rw-r--r-- | pysite/views/wiki/edit.py | 4 | ||||
-rw-r--r-- | pysite/views/wiki/move.py | 4 |
3 files changed, 5 insertions, 5 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() |