From cbb71490b1cf4a0630d928a6a476fec9be2f462d Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 5 Feb 2018 17:10:02 +0100 Subject: [PATCH] Fix handling of disclaimers --- src/js/yunohost/controllers/tools.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/js/yunohost/controllers/tools.js b/src/js/yunohost/controllers/tools.js index 5d21b7bf..05afc6fb 100644 --- a/src/js/yunohost/controllers/tools.js +++ b/src/js/yunohost/controllers/tools.js @@ -264,16 +264,17 @@ app.get('#/tools/migrations/run', function (c) { c.api('/migrations?pending', function(pending_migrations) { + pending_migrations = pending_migrations.migrations; var disclaimers = []; var migrationsLength = pending_migrations.length; for(var i = 0; i < migrationsLength; i++) { - if (pending_migrations[i].disclaimer) + var m = pending_migrations[i]; + if (m.disclaimer) { - disclaimers.push(pending_migrations[i].disclaimer); - console.log("Disclaimer found !"); + disclaimers.push("

"+m.number+". "+m.name+"

" + +m.disclaimer.replace(/\n/g, "
")); } }; - console.log(disclaimers); if (disclaimers.length) { c.confirm(