rattail/tailbone
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Show *correct* system title when upgrading

Browse source 
may not be the same as primary app title
This commit is contained in:
Lance Edgar 2022-12-25 15:13:59 -06:00
parent 8264a69cec
commit c389ebabd0
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tailbone/templates/upgrades/view.mako
View file

@ -66,7 +66,7 @@
<div class="level-item has-text-centered" <div class="level-item has-text-centered"
style="display: flex; flex-direction: column;"> style="display: flex; flex-direction: column;">
<p class="block"> <p class="block">
Upgrading ${app_title} (please wait) ... Upgrading ${system_title} (please wait) ...
{{ executeUpgradeComplete ? "DONE!" : "" }} {{ executeUpgradeComplete ? "DONE!" : "" }}
</p> </p>
<b-progress size="is-large" <b-progress size="is-large"
@ -202,7 +202,7 @@
ThisPage.methods.showExecuteDialog = function() { ThisPage.methods.showExecuteDialog = function() {
this.upgradeExecuting = true this.upgradeExecuting = true
document.title = "Upgrading ${app_title} ..." document.title = "Upgrading ${system_title} ..."
this.$nextTick(() => { this.$nextTick(() => {
this.adjustTextoutHeight() this.adjustTextoutHeight()
}) })

7
tailbone/views/upgrades.py
View file

@ -149,8 +149,15 @@ class UpgradeView(MasterView):
return 'notice' return 'notice'
def template_kwargs_view(self, **kwargs): def template_kwargs_view(self, **kwargs):
kwargs = super(UpgradeView, self).template_kwargs_view(**kwargs)
upgrade = kwargs['instance'] upgrade = kwargs['instance']
kwargs['system_title'] = self.rattail_config.app_title()
if upgrade.system:
system = self.upgrade_handler.get_system(upgrade.system)
if system:
kwargs['system_title'] = system['label']
kwargs['show_prev_next'] = True kwargs['show_prev_next'] = True
kwargs['prev_url'] = None kwargs['prev_url'] = None
kwargs['next_url'] = None kwargs['next_url'] = None