Show *correct* system title when upgrading
may not be the same as primary app title
This commit is contained in:
parent
8264a69cec
commit
c389ebabd0
|
@ -66,7 +66,7 @@
|
|||
<div class="level-item has-text-centered"
|
||||
style="display: flex; flex-direction: column;">
|
||||
<p class="block">
|
||||
Upgrading ${app_title} (please wait) ...
|
||||
Upgrading ${system_title} (please wait) ...
|
||||
{{ executeUpgradeComplete ? "DONE!" : "" }}
|
||||
</p>
|
||||
<b-progress size="is-large"
|
||||
|
@ -202,7 +202,7 @@
|
|||
|
||||
ThisPage.methods.showExecuteDialog = function() {
|
||||
this.upgradeExecuting = true
|
||||
document.title = "Upgrading ${app_title} ..."
|
||||
document.title = "Upgrading ${system_title} ..."
|
||||
this.$nextTick(() => {
|
||||
this.adjustTextoutHeight()
|
||||
})
|
||||
|
|
|
@ -149,8 +149,15 @@ class UpgradeView(MasterView):
|
|||
return 'notice'
|
||||
|
||||
def template_kwargs_view(self, **kwargs):
|
||||
kwargs = super(UpgradeView, self).template_kwargs_view(**kwargs)
|
||||
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['prev_url'] = None
|
||||
kwargs['next_url'] = None
|
||||
|
|
Loading…
Reference in a new issue