Skip to content
Snippets Groups Projects
Commit 99304be4 authored by Vincent Petry's avatar Vincent Petry
Browse files

Read version and product name from update template

During upgrade, the config settings aren't always available due to
base.php changes. This fix makes the update info page read the product
name and version from the update template, which already had them.
parent 65ee2b1d
Branches
No related tags found
No related merge requests found
......@@ -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;
});
});
<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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment