diff --git a/src/js/yunohost/controllers/tools.js b/src/js/yunohost/controllers/tools.js index bb8d7ee9..e0f1acc9 100644 --- a/src/js/yunohost/controllers/tools.js +++ b/src/js/yunohost/controllers/tools.js @@ -50,6 +50,8 @@ // System update & upgrade app.get('#/update', function (c) { c.api('PUT', '/update', {}, function(data) { + c.api('GET', '/migrations?pending', {}, function(pending_migrations) { + data.pending_migrations = pending_migrations.migrations; c.view('tools/tools_update', data, function() { // Configure buttons behaviors $("button[data-upgrade]").on("click", function() { @@ -84,6 +86,7 @@ }); }); }); + }); }); // Display journals list diff --git a/src/locales/en.json b/src/locales/en.json index cf24db55..932140a0 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -228,6 +228,7 @@ "logs_share_with_yunopaste": "Share with YunoPaste", "logs_more": "Display more lines", "path_url": "Path", + "pending_migrations": "There are some pending migrations waiting to be ran. Please go to the Tools > Migrations view to run them.", "port": "Port", "ports": "Ports", "postinstall": "Post-installation", diff --git a/src/views/tools/tools_update.ms b/src/views/tools/tools_update.ms index ffe1a2d5..a9d3e02b 100644 --- a/src/views/tools/tools_update.ms +++ b/src/views/tools/tools_update.ms @@ -5,6 +5,12 @@
+{{#if pending_migrations}} +