YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Show disclaimer + ack checkbox directly on page instead of using modals. Check that disclaimer was acknowledged.

Browse source
This commit is contained in:
Alexandre Aubin 2018-04-13 03:45:15 +02:00
parent 06ac72375f
commit 535f4c01a8
2 changed files with 45 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/js/yunohost/controllers/tools.js
View file

@ -260,6 +260,10 @@
// Get rid of _ in the raw name of migrations (cosmetic)
for(var i = 0; i < pending_migrations.length; i++) {
pending_migrations[i].name = pending_migrations[i].name.replace(/_/g, " ")
if (pending_migrations[i].disclaimer)
{
pending_migrations[i].disclaimer = pending_migrations[i].disclaimer.replace(/\n/g, "<br />");
}
}
for(var i = 0; i < done_migrations.length; i++) {
done_migrations[i].name = done_migrations[i].name.replace(/_/g, " ")
@ -274,45 +278,43 @@
});
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++) {
var m = pending_migrations[i];
if (m.disclaimer)
{
disclaimers.push("<h3>"+m.number+". "+m.name+"</h3>"
+m.disclaimer.replace(/\n/g, "<br />"));
}
};
if (disclaimers.length)
var disclaimerAcks = $(".disclaimer-ack");
var withAcceptDisclaimerFlag = false;
for (var i = 0 ; i < disclaimerAcks.length ; i++)
{
console.log($(disclaimerAcks[i]).find("input:checked").val());
if (! $(disclaimerAcks[i]).find("input:checked").val())
{
c.confirm(
y18n.t('migrations'),
disclaimers.join('<hr>'),
function(){
c.api('/migrations/migrate?accept_disclaimer',
function (data) {
store.clear('slide');
c.redirect('#/tools/migrations');
}, 'POST')
},
function(){
store.clear('slide');
c.redirect('#/tools/migrations');
}
);
// FIXME / TODO i18n
c.flash('fail', "Some of these migrations require you to acknowledge a disclaimer before running them.");
c.redirect('#/tools/migrations');
return;
}
else
{
c.api('/migrations/migrate',
withAcceptDisclaimerFlag = true;
}
};
// Not sure if necessary, but this distinction is to avoid accidentally
// triggering a migration with a disclaimer if one goes to the
// /tools/migrations/run page "directly" somehow ...
if (withAcceptDisclaimerFlag)
{
c.api('/migrations/migrate?accept_disclaimer',
function (data) {
store.clear('slide');
c.redirect('#/tools/migrations');
}, 'POST');
}
});
}, 'POST')
}
else
{
c.api('/migrations/migrate',
function (data) {
store.clear('slide');
c.redirect('#/tools/migrations');
}, 'POST')
}
});
app.get('#/tools/migrations/skip', function (c) {

11
src/views/tools/tools_migrations.ms
View file

@ -28,6 +28,17 @@
<p id="description-migration-{{number}}" class="list-group-item-text">
{{ description }}
</p>
{{#if disclaimer }}
<hr>
<p id="disclaimer-migration-{{number}}" class="list-group-item-text">
{{ disclaimer }}
<div style="margin-left:20px">
<label style="" id="disclaimer-ack-migration-{{number}}" class="checkbox disclaimer-ack">
<input type="checkbox"> I read and understood this disclaimer
</label>
</div>
</p>
{{/if}}
</div>
{{/pending_migrations}}
</div>