From 3e0f25f05f585e5cd9a06efa20b3246787b07436 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 10 Sep 2019 16:13:21 +0200 Subject: [PATCH] Migrations shall be skipped 1 by 1 now --- src/js/yunohost/controllers/tools.js | 4 ++-- src/views/tools/tools_migrations.ms | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/js/yunohost/controllers/tools.js b/src/js/yunohost/controllers/tools.js index 7749a105..8c7fb36c 100644 --- a/src/js/yunohost/controllers/tools.js +++ b/src/js/yunohost/controllers/tools.js @@ -347,12 +347,12 @@ } }); - app.get('#/tools/migrations/skip', function (c) { + app.get('#/tools/migrations/skip/:migration_id', function (c) { c.confirm( y18n.t('migrations'), y18n.t('confirm_migrations_skip'), function(){ - c.api('/migrations/migrate?skip', function(data) { + c.api('/migrations/migrate?skip&targets=' + c.params['migration_id'], function(data) { store.clear('slide'); c.redirect('#/tools/migrations'); }, 'POST'); diff --git a/src/views/tools/tools_migrations.ms b/src/views/tools/tools_migrations.ms index 8a2b678e..8ffbcedf 100644 --- a/src/views/tools/tools_migrations.ms +++ b/src/views/tools/tools_migrations.ms @@ -11,8 +11,7 @@

{{t 'migrations_pending'}} {{#if pending_migrations}} {{/if}}

@@ -24,6 +23,9 @@

{{ number }}. {{ description }} +

{{#if disclaimer }}