From 1fe0ce481e64da1898fbb38b913e5715d8e2ebd6 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Fri, 14 Nov 2014 21:31:43 +0100 Subject: [PATCH 1/3] sort list of collections when creating a graph --- .../frontend/js/views/graphManagementView.js | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/js/apps/system/aardvark/frontend/js/views/graphManagementView.js b/js/apps/system/aardvark/frontend/js/views/graphManagementView.js index 78265a25eb..21d33192fc 100644 --- a/js/apps/system/aardvark/frontend/js/views/graphManagementView.js +++ b/js/apps/system/aardvark/frontend/js/views/graphManagementView.js @@ -430,7 +430,18 @@ name = "", edgeDefinitions = [{collection : "", from : "", to :""}], orphanCollections = "", - title; + title, + sorter = function(l, r) { + l = l.toLowerCase(); + r = r.toLowerCase(); + if (l < r) { + return -1; + } + if (l > r) { + return 1; + } + return 0; + }; this.eCollList = []; this.removedECollList = []; @@ -510,7 +521,7 @@ false, true, 1, - self.eCollList + self.eCollList.sort(sorter) ) ); } else { @@ -525,7 +536,7 @@ true, false, 1, - self.eCollList + self.eCollList.sort(sorter) ) ); } @@ -540,7 +551,7 @@ false, false, 10, - collList + collList.sort(sorter) ) ); tableContent.push( @@ -554,7 +565,7 @@ false, false, 10, - collList + collList.sort(sorter) ) ); self.counter++; @@ -572,7 +583,7 @@ false, false, 10, - collList + collList.sort(sorter) ) ); From 7f6d6f914291ba3ac0fc37e50e9f372b727a5ced Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Fri, 14 Nov 2014 21:54:05 +0100 Subject: [PATCH 2/3] issue #1069: Add 'raw' link to swagger ui so that the raw swagger json can easily be retrieved Added *Raw* link in documentation overview --- js/apps/system/aardvark/frontend/js/lib/swagger-ui.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js/apps/system/aardvark/frontend/js/lib/swagger-ui.js b/js/apps/system/aardvark/frontend/js/lib/swagger-ui.js index 79ab04c66f..348ba74840 100644 --- a/js/apps/system/aardvark/frontend/js/lib/swagger-ui.js +++ b/js/apps/system/aardvark/frontend/js/lib/swagger-ui.js @@ -550,7 +550,10 @@ helpers = helpers || Handlebars.helpers; data = data || {}; if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); } else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; } buffer += escapeExpression(stack1) - + "'); return false;\">\n Expand\n \n \n \n\n\n\n