From d72158d78ff9cac1a259ee23d89042a3ed13c7e4 Mon Sep 17 00:00:00 2001 From: j Date: Wed, 13 Jan 2016 10:47:20 +0530 Subject: [PATCH] return new version as version --- oml/update.py | 3 ++- static/js/updateDialog.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/oml/update.py b/oml/update.py index 2afa9d6..769f74e 100644 --- a/oml/update.py +++ b/oml/update.py @@ -199,6 +199,7 @@ def getVersion(data): ''' response = { 'current': settings.MINOR_VERSION, + 'version': settings.MINOR_VERSION, 'upgrade': False, } if settings.MINOR_VERSION == 'git': @@ -225,7 +226,7 @@ def getVersion(data): current = current_version('openmedialibrary') response['current'] = current new = release['modules']['openmedialibrary']['version'] - response['new'] = new + response['version'] = new response['update'] = current < new return response actions.register(getVersion, cache=False) diff --git a/static/js/updateDialog.js b/static/js/updateDialog.js index 367d80e..43a9d23 100644 --- a/static/js/updateDialog.js +++ b/static/js/updateDialog.js @@ -31,7 +31,7 @@ oml.ui.updateDialog = function() { .html( oml.version != 'git' ? Ox._( - 'You are running Open Media Library version {0}.

', + 'You are running Open Media Library version
{0}.

', [oml.version] ) : Ox._( @@ -161,4 +161,4 @@ oml.ui.updateDialog = function() { return that; -}; \ No newline at end of file +};