diff options
| author | Chon Kou <k.kou@alumni.ubc.ca> | 2017-09-10 00:54:06 -0700 |
|---|---|---|
| committer | Chon Kou <k.kou@alumni.ubc.ca> | 2017-09-10 20:50:22 -0700 |
| commit | d5cfb38449e94e48f572003a9f19dd47cd57aeaa (patch) | |
| tree | ed74f17dabf00cb898ef89e7650ef533c4229570 /settings | |
| parent | 25f2546a7bb67371a051c387e0bb034f5ba87891 (diff) | |
| download | nextcloud-server-d5cfb38449e94e48f572003a9f19dd47cd57aeaa.tar.gz nextcloud-server-d5cfb38449e94e48f572003a9f19dd47cd57aeaa.zip | |
Sort apps by enabled/disabled but not by official/in-appstore in App Management
Signed-off-by: Chon Kou <k.kou@alumni.ubc.ca>
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/js/apps.js | 6 | ||||
| -rw-r--r-- | settings/tests/js/appsSpec.js | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js index 278c307b1f3..258b0f4adcc 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -114,11 +114,7 @@ OC.Settings.Apps = OC.Settings.Apps || { if (a.active !== b.active) { return (a.active ? -1 : 1) } else { - var levelDiff = b.level - a.level; - if (levelDiff === 0) { - return OC.Util.naturalSortCompare(a.name, b.name); - } - return levelDiff; + return OC.Util.naturalSortCompare(a.name, b.name); } }); } diff --git a/settings/tests/js/appsSpec.js b/settings/tests/js/appsSpec.js index 4b917b425c1..bc4681e2b8d 100644 --- a/settings/tests/js/appsSpec.js +++ b/settings/tests/js/appsSpec.js @@ -172,7 +172,7 @@ describe('OC.Settings.Apps tests', function() { return results; } - it('sorts all applications using the level', function() { + it('does not sort applications using the level', function() { Apps.loadCategory('TestId'); suite.server.requests[0].respond( @@ -223,7 +223,7 @@ describe('OC.Settings.Apps tests', function() { var results = getResultsFromDom(); expect(results.length).toEqual(5); - expect(results).toEqual(['alpha', 'delta', 'zork', 'foo', 'nolevel']); + expect(results).toEqual(['alpha', 'foo', 'delta', 'nolevel', 'zork']); expect(OC.Settings.Apps.State.apps).toEqual({ 'foo': { id: 'foo', |