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

Merge pull request #218 from YunoHost/confirm-when-installing-bad-quality-apps

Browse source 
[enh] Confirm when installing experimental or low quality apps
This commit is contained in:
Alexandre Aubin 2018-12-15 15:48:16 +01:00 committed by GitHub
commit 0039c5d4ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/js/yunohost/controllers/apps.js
View file

@ -18,10 +18,10 @@
}); });
function levelToColor(level) { function levelToColor(level) {
if (level > 6) { if (level >= 3) {
return 'success'; return 'success';
} }
else if (level >= 2) { else if (level >= 1) {
return 'warning'; return 'warning';
} }
else if (isNaN(level)) { else if (isNaN(level)) {
@ -41,13 +41,14 @@
} }
function combineColors(stateColor, levelColor, installable) { function combineColors(stateColor, levelColor, installable) {
if (stateColor === "dangers" || levelColor === "danger") { if (stateColor === "danger" || levelColor === "danger") {
return 'danger'; return 'danger';
} }
if (stateColor === "warnings" || levelColor === "warnings" || levelColor === "default") { else if (stateColor === "warning" || levelColor === "warning" || levelColor === "default") {
return 'warning'; return 'warning';
} }
else { else
{
return 'success'; return 'success';
} }
} }
@ -488,11 +489,36 @@
// App installation form // App installation form
app.get('#/apps/install/:app', function (c) { app.get('#/apps/install/:app', function (c) {
c.api('/apps?raw', function(data) { // http://api.yunohost.org/#!/app/app_list_get_8 c.api('/apps?raw', function(data) { // http://api.yunohost.org/#!/app/app_list_get_8
c.appInstallForm( var state_color = stateToColor(data[c.params['app']]['state']);
c.params['app'], var level_color = levelToColor(parseInt(data[c.params['app']]['level']));
data[c.params['app']].manifest, var is_safe_for_install_color = combineColors(state_color, level_color);
c.params
); if ((is_safe_for_install_color === "warning") || (is_safe_for_install_color === "danger"))
{
c.confirm(
y18n.t("applications"),
y18n.t("confirm_install_app_"+is_safe_for_install_color),
function(){
c.appInstallForm(
c.params['app'],
data[c.params['app']].manifest,
c.params
);
},
function(){
$('div.loader').remove();
c.redirect('#/apps/install');
}
);
}
else
{
c.appInstallForm(
c.params['app'],
data[c.params['app']].manifest,
c.params
);
}
}); });
}); });

4
src/locales/en.json
View file

@ -75,8 +75,10 @@
"confirm_delete": "Are you sure you want to delete %s ?", "confirm_delete": "Are you sure you want to delete %s ?",
"confirm_firewall_open": "Are you sure you want to open port %s? (protocol: %s, connection: %s)", "confirm_firewall_open": "Are you sure you want to open port %s? (protocol: %s, connection: %s)",
"confirm_firewall_close": "Are you sure you want to close port %s? (protocol: %s, connection: %s)", "confirm_firewall_close": "Are you sure you want to close port %s? (protocol: %s, connection: %s)",
"confirm_install_custom_app": "Installing 3rd party applications may compromise the security of your system. Use at your own risk.", "confirm_install_custom_app": "WARNING ! Installing 3rd party applications may compromise the integrity and security of your system. You should probably NOT install it unless you know what you are doing. Are you willing to take that risk ?",
"confirm_install_domain_root": "You will not be able to install any other app on %s. Continue ?", "confirm_install_domain_root": "You will not be able to install any other app on %s. Continue ?",
"confirm_install_app_warning": "Warning : this application may work but is not well-integrated in YunoHost. Some features such as single sign-on and backup/restore might not be available.",
"confirm_install_app_danger": "WARNING ! This application is still experimental (if not explicitly not working) and it is likely to break your system ! You should probably NOT install it unless you know what you are doing. Are you willing to take that risk ?",
"confirm_migrations_skip": "Skipping migrations is not recommended. Are you sure you want to do that?", "confirm_migrations_skip": "Skipping migrations is not recommended. Are you sure you want to do that?",
"confirm_postinstall": "You are about to launch the post-installation process on the domain %s. It may take a few minutes, *do not interrupt the operation*.", "confirm_postinstall": "You are about to launch the post-installation process on the domain %s. It may take a few minutes, *do not interrupt the operation*.",
"confirm_restore": "Are you sure you want to restore %s ?", "confirm_restore": "Are you sure you want to restore %s ?",