Repository: cloudstack
Updated Branches:
refs/heads/4.4 024a2924b -> befa28251
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/befa2825
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/befa2825
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/befa2825
Branch: refs/heads/4.4
Commit: befa28251d0e250f07c52a9a2cd4441cc8bd86d8
Parents: 024a292
Author: Remi Bergsma <rb...@schubergphilis.com>
Authored: Sun Apr 12 23:20:29 2015 -0500
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Wed Apr 15 16:29:15 2015 -0500
----------------------------------------------------------------------
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 ++++++++++++++++++++++++---
10 files changed, 69 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/befa2825/ui/scripts/accountsWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/accountsWizard.js b/ui/scripts/accountsWizard.js
index f022193..ea0c214 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/befa2825/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index aff6056..cf651b6 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -486,6 +486,9 @@
description: this.path
});
});
+ items.sort(function(a, b) {
+ return a.description.localeCompare(b.description);
+ });
args.response.success({
data: items
});
@@ -1100,6 +1103,9 @@
description: this.path
});
});
+ items.sort(function(a, b) {
+ return a.description.localeCompare(b.description);
+ });
args.response.success({
data: items
});
@@ -1707,6 +1713,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/befa2825/ui/scripts/events.js
----------------------------------------------------------------------
diff --git a/ui/scripts/events.js b/ui/scripts/events.js
index 2731cb6..a65bf65 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/befa2825/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 93a40fc..c0bb269 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -224,6 +224,9 @@
});
}
}
+ array1.sort(function(a, b) {
+ return a.description.localeCompare(b.description);
+ });
args.response.success({
data: array1
});
@@ -1611,6 +1614,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/befa2825/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index bc2436f8..1c3798e 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
});
@@ -5196,6 +5202,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/befa2825/ui/scripts/projects.js
----------------------------------------------------------------------
diff --git a/ui/scripts/projects.js b/ui/scripts/projects.js
index 53b7964..3e7f632 100644
--- a/ui/scripts/projects.js
+++ b/ui/scripts/projects.js
@@ -723,6 +723,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/befa2825/ui/scripts/regions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/regions.js b/ui/scripts/regions.js
index 368c1bf..99ab33e 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/befa2825/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 2daeba5..662e661 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -430,6 +430,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/befa2825/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 0553230..4efa322 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -431,6 +431,9 @@
});
}
}
+ array1.sort(function(a, b) {
+ return a.description.localeCompare(b.description);
+ });
args.response.success({
data: array1
});
@@ -1572,6 +1575,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/befa2825/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index d619906..0ab755c 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -7283,7 +7283,10 @@
description: this.name
});
});
-
+ items.sort(function(a, b) {
+ return a.description.localeCompare(b.description);
+ });
+
args.response.success({
data: items
});
@@ -12107,6 +12110,9 @@
description: this.name
});
});
+ items.sort(function(a, b) {
+ return a.description.localeCompare(b.description);
+ });
args.response.success({
data: items
@@ -12322,7 +12328,10 @@
description: this.name
});
});
-
+ items.sort(function(a, b) {
+ return a.description.localeCompare(b.description);
+ });
+
args.response.success({
data: items
});
@@ -12922,7 +12931,10 @@
description: this.name
});
});
-
+ items.sort(function(a, b) {
+ return a.description.localeCompare(b.description);
+ });
+
args.response.success({
data: items
});
@@ -13458,6 +13470,9 @@
description: this.name
});
});
+ items.sort(function(a, b) {
+ return a.description.localeCompare(b.description);
+ });
args.response.success({
data: items
@@ -14291,6 +14306,9 @@
description: this.name
});
});
+ items.sort(function(a, b) {
+ return a.description.localeCompare(b.description);
+ });
args.response.success({
data: items
@@ -14573,6 +14591,9 @@
description: this.name
});
});
+ items.sort(function(a, b) {
+ return a.description.localeCompare(b.description);
+ });
args.response.success({
data: items