mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

App management: Do not show udpdate category if no updates are available 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2017-10-04 14:23:51 +02:00
parent a3502c5c67
commit bee9ef83c6
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
settings/js/apps.js
View File

@ -42,7 +42,6 @@ OC.Settings.Apps = OC.Settings.Apps || {
var categories = [
{displayName: t('settings', 'Your apps'), ident: 'installed', id: '0'},
{displayName: t('settings', 'Updates'), ident: 'updates', id: '3'},
{displayName: t('settings', 'Enabled apps'), ident: 'enabled', id: '1'},
{displayName: t('settings', 'Disabled apps'), ident: 'disabled', id: '2'}
];
@ -65,7 +64,6 @@ OC.Settings.Apps = OC.Settings.Apps || {
$('#apps-categories').html(html);
$('#app-category-' + OC.Settings.Apps.State.currentCategory).addClass('active');
if (updateCategory.length === 1) {
console.log(updateCategory);
OC.Settings.Apps.State.availableUpdates = updateCategory[0].counter;
OC.Settings.Apps.refreshUpdateCounter();
}
@ -130,6 +128,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
}
var firstExperimental = false;
var hasNewUpdates = false;
_.each(appList, function(app) {
if(app.level === 0 && firstExperimental === false) {
firstExperimental = true;
@ -139,11 +138,20 @@ OC.Settings.Apps = OC.Settings.Apps || {
}
if (app.update) {
hasNewUpdates = true;
var $update = $('#app-' + app.id + ' .update');
$update.removeClass('hidden');
$update.val(t('settings', 'Update to %s').replace(/%s/g, app.update));
}
});
// reload updates if a list with new updates is loaded
if (hasNewUpdates) {
OC.Settings.Apps.reloadUpdates();
} else {
// hide update category after all updates are installed
// and the user is switching away from the empty updates view
OC.Settings.Apps.refreshUpdateCounter();
}
} else {
if (categoryId === 'updates') {
OC.Settings.Apps.showEmptyUpdates();
@ -671,12 +679,30 @@ OC.Settings.Apps = OC.Settings.Apps || {
});
},
reloadUpdates: function() {
if (this._loadUpdatesCall) {
this._loadUpdatesCall.abort();
}
this._loadUpdatesCall = $.ajax(OC.generateUrl('settings/apps/list?category=updates'), {
type:'GET',
success: function (apps) {
OC.Settings.Apps.State.availableUpdates = apps.apps.length;
OC.Settings.Apps.refreshUpdateCounter();
}
});
},
refreshUpdateCounter: function() {
var $updateCount = $('#app-category-updates').find('.app-navigation-entry-utils-counter');
var $appCategoryUpdates = $('#app-category-updates');
var $updateCount = $appCategoryUpdates.find('.app-navigation-entry-utils-counter');
if (OC.Settings.Apps.State.availableUpdates > 0) {
$updateCount.html(OC.Settings.Apps.State.availableUpdates);
$appCategoryUpdates.show();
} else {
$updateCount.empty();
if (OC.Settings.Apps.State.currentCategory !== 'updates') {
$appCategoryUpdates.hide();
}
}
},
@ -727,6 +753,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
filter: function(query) {
var $appList = $('#apps-list'),
$emptyList = $('#apps-list-empty');
$('#app-list-empty-icon').addClass('icon-search').removeClass('icon-download');
$appList.removeClass('hidden');
$appList.find('.section').removeClass('hidden');
$emptyList.addClass('hidden');