diff --git a/src/js/yunohost/controllers/apps.js b/src/js/yunohost/controllers/apps.js index d34b0b50..e2cc23e1 100644 --- a/src/js/yunohost/controllers/apps.js +++ b/src/js/yunohost/controllers/apps.js @@ -131,31 +131,6 @@ }); }); - // List available apps lists - app.get('#/apps/lists', function (c) { - c.api('/appslists', function(data) { - list = []; - var has_community_list = false; - $.each(data, function(listname, listinfo) { - list.push({ - 'name': listname, - 'url': listinfo['url'], - 'lastUpdate': listinfo['lastUpdate'] - }); - - // Check for community list - if (listname == 'community' || listinfo['url'] == 'https://app.yunohost.org/community.json') { - has_community_list = true; - } - }); - - c.view('app/app_appslists_list', { - appslists: list, - has_community_list: has_community_list - }); - }, 'GET'); - }); - // Get app information app.get('#/apps/:app', function (c) { c.api('/apps/'+c.params['app']+'?raw', function(data) { // http://api.yunohost.org/#!/app/app_info_get_9 diff --git a/src/js/yunohost/controllers/tools.js b/src/js/yunohost/controllers/tools.js index 61c79b06..7749a105 100644 --- a/src/js/yunohost/controllers/tools.js +++ b/src/js/yunohost/controllers/tools.js @@ -391,7 +391,7 @@ c.api('/appslists', function(data) { store.clear('slide'); - c.redirect('#/apps/lists/' + list.name); + c.redirect('#/tools/appslists/' + list.name); }, 'PUT', list); }); @@ -410,7 +410,7 @@ else { c.flash('warning', y18n.t('appslists_unknown_list', [c.params['appslist']])); store.clear('slide'); - c.redirect('#/apps/lists'); + c.redirect('#/tools/appslists'); } }, 'GET'); }); @@ -426,7 +426,7 @@ // Refresh specific apps list app.get('#/tools/appslists/:appslist/refresh', function (c) { c.api('/appslists', function(data) { - c.redirect('#/apps/lists'); + c.redirect('#/tools/appslists'); }, 'PUT', {'name' : c.params['appslist']}); }); @@ -437,12 +437,12 @@ y18n.t('appslists_confirm_remove', [c.params['app']]), function() { c.api('/appslists', function() { - c.redirect('#/apps/lists'); + c.redirect('#/tools/appslists'); }, 'DELETE', {'name' : c.params['appslist']}); }, function() { store.clear('slide'); - c.redirect('#/apps/lists/'+ c.params['appslist']); + c.redirect('#/tools/appslists/'+ c.params['appslist']); } ); }); diff --git a/src/views/tools/tools_appslists_list.ms b/src/views/tools/tools_appslists_list.ms index ede16f19..3357de3e 100644 --- a/src/views/tools/tools_appslists_list.ms +++ b/src/views/tools/tools_appslists_list.ms @@ -34,7 +34,7 @@