Repository: cloudstack Updated Branches: refs/heads/master 8a5b1e60a -> cd67382b6
CLOUDSTACK-6543 Sort domain lists in UI As recently discussed on the dev list: This sorts the domain lists based on their path. Especially handy when having a lot of domains, like in a public cloud. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a7f8059f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a7f8059f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a7f8059f Branch: refs/heads/master Commit: a7f8059fd35dae42a04583b4333b28ec0d68218a Parents: c158cff Author: Remi Bergsma <[email protected]> Authored: Sun Apr 12 23:20:29 2015 -0500 Committer: Remi Bergsma <[email protected]> Committed: Sun Apr 12 23:21:43 2015 -0500 ---------------------------------------------------------------------- ui/scripts/accounts.js | 3 +++ ui/scripts/accountsWizard.js | 3 +++ ui/scripts/configuration.js | 9 +++++++++ ui/scripts/events.js | 3 +++ ui/scripts/instances.js | 6 ++++++ ui/scripts/network.js | 9 +++++++++ ui/scripts/projects.js | 3 +++ ui/scripts/regions.js | 3 +++ ui/scripts/sharedFunctions.js | 3 +++ ui/scripts/storage.js | 6 ++++++ ui/scripts/system.js | 27 ++++++++++++++++++++++++--- 11 files changed, 72 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a7f8059f/ui/scripts/accounts.js ---------------------------------------------------------------------- diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js index 62ed4b8..d539af4 100644 --- a/ui/scripts/accounts.js +++ b/ui/scripts/accounts.js @@ -1561,6 +1561,9 @@ description: this.path }); }); + items.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: items }); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a7f8059f/ui/scripts/accountsWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/accountsWizard.js b/ui/scripts/accountsWizard.js index 6b0dd19..82e7eab 100644 --- a/ui/scripts/accountsWizard.js +++ b/ui/scripts/accountsWizard.js @@ -92,6 +92,9 @@ if (this.level === 0) rootDomainId = this.id; }); + items.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: items }); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a7f8059f/ui/scripts/configuration.js ---------------------------------------------------------------------- diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index ceb0485..184e38a 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -573,6 +573,9 @@ description: this.path }); }); + items.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: items }); @@ -1220,6 +1223,9 @@ description: this.path }); }); + items.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: items }); @@ -1893,6 +1899,9 @@ description: this.path }); }); + items.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: items }); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a7f8059f/ui/scripts/events.js ---------------------------------------------------------------------- diff --git a/ui/scripts/events.js b/ui/scripts/events.js index a15f996..9280429 100644 --- a/ui/scripts/events.js +++ b/ui/scripts/events.js @@ -301,6 +301,9 @@ }); } } + array1.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: array1 }); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a7f8059f/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index de0cff7..81732d7 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -236,6 +236,9 @@ }); } } + array1.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: array1 }); @@ -1758,6 +1761,9 @@ }); } } + array1.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: array1 }); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a7f8059f/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index f62502f..3ae3a73 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -656,6 +656,9 @@ description: this.path }); }); + items.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: items }); @@ -830,6 +833,9 @@ }); } } + array1.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: array1 }); @@ -5254,6 +5260,9 @@ }); } } + array1.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: array1 }); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a7f8059f/ui/scripts/projects.js ---------------------------------------------------------------------- diff --git a/ui/scripts/projects.js b/ui/scripts/projects.js index 74812a1..86e4f88 100644 --- a/ui/scripts/projects.js +++ b/ui/scripts/projects.js @@ -734,6 +734,9 @@ }); } } + array1.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: array1 }); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a7f8059f/ui/scripts/regions.js ---------------------------------------------------------------------- diff --git a/ui/scripts/regions.js b/ui/scripts/regions.js index fab43e6..f7cb8fd 100644 --- a/ui/scripts/regions.js +++ b/ui/scripts/regions.js @@ -377,6 +377,9 @@ }); } } + array1.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: array1 }); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a7f8059f/ui/scripts/sharedFunctions.js ---------------------------------------------------------------------- diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index 2d1977e..e8f7cc9 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -483,6 +483,9 @@ var addGuestNetworkDialog = { } }); } + items.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: items }); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a7f8059f/ui/scripts/storage.js ---------------------------------------------------------------------- diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index feda21c..1773c27 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -467,6 +467,9 @@ }); } } + array1.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: array1 }); @@ -1743,6 +1746,9 @@ }); } } + array1.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: array1 }); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a7f8059f/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index b1aafaa..5e6adcf 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -7958,7 +7958,10 @@ description: this.name }); }); - + items.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); + args.response.success({ data: items }); @@ -13246,6 +13249,9 @@ description: this.name }); }); + items.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: items @@ -13461,7 +13467,10 @@ description: this.name }); }); - + items.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); + args.response.success({ data: items }); @@ -14059,7 +14068,10 @@ description: this.name }); }); - + items.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); + args.response.success({ data: items }); @@ -14614,6 +14626,9 @@ description: this.name }); }); + items.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: items @@ -15501,6 +15516,9 @@ description: this.name }); }); + items.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: items @@ -15831,6 +15849,9 @@ description: this.name }); }); + items.sort(function(a, b) { + return a.description.localeCompare(b.description); + }); args.response.success({ data: items
