diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/update.js | 12 | ||||
| -rw-r--r-- | core/templates/update.admin.php | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/core/js/update.js b/core/js/update.js index 4899335f0ec..f63808f65be 100644 --- a/core/js/update.js +++ b/core/js/update.js @@ -17,7 +17,7 @@ * * @param $el progress list element */ - start: function($el) { + start: function($el, options) { if (this._started) { return; } @@ -28,8 +28,8 @@ this.addMessage(t( 'core', 'Updating {productName} to version {version}, this may take a while.', { - productName: OC.theme.name || 'ownCloud', - version: OC.config.versionstring + productName: options.productName || 'ownCloud', + version: options.version }), 'bold' ).append('<br />'); // FIXME: these should be ul/li with CSS paddings! @@ -76,10 +76,14 @@ $(document).ready(function() { $('.updateButton').on('click', function() { + var $updateEl = $('.update'); var $progressEl = $('.updateProgress'); $progressEl.removeClass('hidden'); $('.updateOverview').addClass('hidden'); - OC.Update.start($progressEl); + OC.Update.start($progressEl, { + productName: $updateEl.attr('data-productname'), + version: $updateEl.attr('data-version'), + }); return false; }); }); diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php index 29df0dd484a..ccd5d236828 100644 --- a/core/templates/update.admin.php +++ b/core/templates/update.admin.php @@ -1,4 +1,4 @@ -<div class="update"> +<div class="update" data-productname="<?php p($_['productName']) ?>" data-version="<?php p($_['version']) ?>"> <div class="updateOverview"> <h2 class="title bold"><?php p($l->t('%s will be updated to version %s.', array($_['productName'], $_['version']))); ?></h2> |