diff --git a/tailbone/templates/upgrades/view.mako b/tailbone/templates/upgrades/view.mako index fe20c1e1..6ae110e0 100644 --- a/tailbone/templates/upgrades/view.mako +++ b/tailbone/templates/upgrades/view.mako @@ -19,9 +19,15 @@ ${parent.render_this_page()} % if expose_websockets and master.has_perm('execute'): - + <${b}-modal full-screen + % if request.use_oruga: + v-model:active="upgradeExecuting" + :cancelable="false" + % else: + :active.sync="upgradeExecuting" + :can-cancel="false" + % endif + >
@@ -32,6 +38,10 @@ Upgrading ${system_title} (please wait) ... {{ executeUpgradeComplete ? "DONE!" : "" }}

+ % if request.use_oruga: + + % else: + % endif
@@ -65,7 +76,7 @@
- + % endif % if master.has_perm('execute'): diff --git a/tailbone/views/master.py b/tailbone/views/master.py index 87c592ee..cc6e25ea 100644 --- a/tailbone/views/master.py +++ b/tailbone/views/master.py @@ -2060,7 +2060,10 @@ class MasterView(View): # caller must explicitly request websocket behavior; otherwise # we will assume traditional behavior for progress - ws = self.request.is_xhr and self.request.json_body.get('ws') + ws = False + if ((self.request.is_xhr or self.request.content_type == 'application/json') + and self.request.json_body.get('ws')): + ws = True # make our progress tracker progress = self.make_execute_progress(obj, ws=ws)