From 257b2e7890ceb6977dd6825d67ffc40d6131c3dc Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Mon, 14 Sep 2020 12:36:41 +0200
Subject: [PATCH] Fix label

---
 src/js/yunohost/controllers/apps.js | 11 +++++++----
 src/views/app/app_info.ms           |  2 +-
 src/views/app/app_list.ms           |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/js/yunohost/controllers/apps.js b/src/js/yunohost/controllers/apps.js
index d60d318e..fc8ae896 100644
--- a/src/js/yunohost/controllers/apps.js
+++ b/src/js/yunohost/controllers/apps.js
@@ -12,6 +12,11 @@
     app.get('#/apps', function (c) {
         c.api('GET', '/apps?full', {}, function(data) {
             var apps = data['apps'];
+            for (var a in apps)
+            {
+                var app = apps[a]
+                app['label'] = app['permissions'][app['id'] + ".main"]['label']
+            }
             c.arraySortById(apps);
             c.view('app/app_list', {apps: apps});
         });
@@ -262,10 +267,9 @@
     // Get app information
     app.get('#/apps/:app', function (c) {
         c.api('GET', '/apps/'+c.params['app']+'?full', {}, function(data) {
-        c.api('GET', '/users/permissions', {}, function(data_permissions) {
+            data.label = data.permissions[c.params['app']+".main"]['label']
 
-            // Permissions
-            data.permissions = data_permissions.permissions[c.params['app']+".main"]["allowed"];
+            data.permissions = data.permissions[c.params['app']+".main"]["allowed"];
 
             // Multilingual description
             data.description = (typeof data.manifest.description[y18n.locale] !== 'undefined') ?
@@ -304,7 +308,6 @@
                 });
             });
         });
-        });
     });
 
     //
diff --git a/src/views/app/app_info.ms b/src/views/app/app_info.ms
index f443d7eb..8f498645 100644
--- a/src/views/app/app_info.ms
+++ b/src/views/app/app_info.ms
@@ -16,7 +16,7 @@
             <dt>{{t 'id'}}</dt>
             <dd>{{settings.id}}</dd>
             <dt>{{t 'label'}}</dt>
-            <dd>{{settings.label}}</dd>
+            <dd>{{label}}</dd>
             <dt>{{t 'description'}}</dt>
             <dd>{{description}}</dd>
             <dt>{{t 'version'}}</dt>
diff --git a/src/views/app/app_list.ms b/src/views/app/app_list.ms
index bf658106..a502aa42 100644
--- a/src/views/app/app_list.ms
+++ b/src/views/app/app_list.ms
@@ -16,7 +16,7 @@
     <a href="#/apps/{{id}}" class="list-group-item slide" title="{{t 'infos'}}">
         <span class="fa-chevron-right pull-right"></span>
         <h2 class="list-group-item-heading">
-            {{settings.label}} <small>{{name}}</small>
+            {{label}} <small>{{name}}</small>
         </h2>
         <p class="list-group-item-text">{{description}}</p>
     </a>