Sort apps by enabled/disabled but not by official/in-appstore in App Management

Signed-off-by: Chon Kou <k.kou@alumni.ubc.ca>

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);
 							}
 						});
 					}

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',