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

Merge remote-tracking branch 'origin/unstable' into unstable

Browse source
This commit is contained in:
Weblate 2015-11-23 21:52:20 +01:00
commit c307c453dd
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/yunohost/app.py
View file

@ -168,24 +168,29 @@ def app_list(offset=None, limit=None, filter=None, raw=False):
sorted_app_dict[sorted_keys] = app_dict[sorted_keys] sorted_app_dict[sorted_keys] = app_dict[sorted_keys]
i = 0 i = 0
for app_id, app_info in sorted_app_dict.items(): for app_id, app_info_dict in sorted_app_dict.items():
if i < limit: if i < limit:
if (filter and ((filter in app_id) or (filter in app_info['manifest']['name']))) or not filter: if (filter and ((filter in app_id) or (filter in app_info_dict['manifest']['name']))) or not filter:
installed = _is_installed(app_id) installed = _is_installed(app_id)
if raw: if raw:
app_info['installed'] = installed app_info_dict['installed'] = installed
if installed: if installed:
app_info['status'] = _get_app_status(app_id) app_info_dict['status'] = _get_app_status(app_id)
list_dict[app_id] = app_info list_dict[app_id] = app_info_dict
else: else:
label = None
if installed:
app_info_dict_raw = app_info(app=app_id, raw=True)
label = app_info_dict_raw['settings']['label']
list_dict.append({ list_dict.append({
'id': app_id, 'id': app_id,
'name': app_info['manifest']['name'], 'name': app_info_dict['manifest']['name'],
'label': label,
'description': _value_for_locale( 'description': _value_for_locale(
app_info['manifest']['description']), app_info_dict['manifest']['description']),
# FIXME: Temporarly allow undefined license # FIXME: Temporarly allow undefined license
'license': app_info['manifest'].get('license', 'license': app_info_dict['manifest'].get('license',
m18n.n('license_undefined')), m18n.n('license_undefined')),
'installed': installed 'installed': installed
}) })