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

[fix] Admin was asking confirmation for official apps

Browse source
This commit is contained in:
Alexandre Aubin 2018-12-27 20:26:14 +01:00
parent c3f60fbecd
commit 4fbf44f0b5
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,7 +59,7 @@
c.api('/apps?raw', function (dataraw) { // http://api.yunohost.org/#!/app/app_list_get_8 c.api('/apps?raw', function (dataraw) { // http://api.yunohost.org/#!/app/app_list_get_8
var apps = [] var apps = []
$.each(data['apps'], function(k, v) { $.each(data['apps'], function(k, v) {
if (dataraw[v['id']]['state'] === "validated") if (dataraw[v['id']]['state'] === "validated")
{ {
dataraw[v['id']]['state'] = "official"; dataraw[v['id']]['state'] = "official";
} }
@ -489,6 +489,10 @@
// 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
if (dataraw[v['id']]['state'] === "validated")
{
dataraw[v['id']]['state'] = "official";
}
var state_color = stateToColor(data[c.params['app']]['state']); var state_color = stateToColor(data[c.params['app']]['state']);
var level_color = levelToColor(parseInt(data[c.params['app']]['level'])); var level_color = levelToColor(parseInt(data[c.params['app']]['level']));
var is_safe_for_install_color = combineColors(state_color, level_color); var is_safe_for_install_color = combineColors(state_color, level_color);