Author: Lars Michelsen <[email protected]>
Date: Fri Sep 9 08:44:01 2011 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Fri Sep 9 08:44:01 2011 +0200
Also sorting the overview page by alias
---
ChangeLog | 2 +-
share/server/core/classes/CoreModMultisite.php | 7 +------
share/server/core/classes/GlobalCore.php | 5 +++++
share/server/core/classes/GlobalIndexPage.php | 1 +
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index eb3fbf9..1e98abb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,7 +24,7 @@ Frontend
* Also disabling the object left click actions in unlocked mode
* Icon/Gadget/Shape/Textbox dragging is done by dragging the real icons
again, like it was in WUI before. The drag controls for these objects has
been removed.
- * Sorting maps in multisite snapin by aliases
+ * Sorting maps on overview page and in multisite snapin by aliases
* Bugfix: Fixed several umlauts in edit mode warning messages
* Bugfix: Fixed 100% sidebar height
* Bugfix: Fixed initial positioning of relative positioned gadgets
diff --git a/share/server/core/classes/CoreModMultisite.php
b/share/server/core/classes/CoreModMultisite.php
index 6dc5414..a1d8d65 100644
--- a/share/server/core/classes/CoreModMultisite.php
+++ b/share/server/core/classes/CoreModMultisite.php
@@ -144,13 +144,8 @@ class CoreModMultisite extends CoreModule {
$aMaps[] = $aObj[0]->getObjectInformation();
}
- usort($aMaps, Array('CoreModMultisite', 'cmpAlias'));
+ usort($aMaps, Array('GlobalCore', 'cmpAlias'));
return $aMaps;
}
-
- // Sort array of map arrays by alias
- static function cmpAlias($a, $b) {
- return strnatcmp($a['alias'], $b['alias']);
- }
}
?>
diff --git a/share/server/core/classes/GlobalCore.php
b/share/server/core/classes/GlobalCore.php
index 8a2ede4..06e255e 100644
--- a/share/server/core/classes/GlobalCore.php
+++ b/share/server/core/classes/GlobalCore.php
@@ -597,5 +597,10 @@ class GlobalCore {
return json_encode($lang);
}
+
+ // Sort array of map arrays by alias
+ static function cmpAlias($a, $b) {
+ return strnatcmp($a['alias'], $b['alias']);
+ }
}
?>
diff --git a/share/server/core/classes/GlobalIndexPage.php
b/share/server/core/classes/GlobalIndexPage.php
index 9b54058..03b3d0e 100644
--- a/share/server/core/classes/GlobalIndexPage.php
+++ b/share/server/core/classes/GlobalIndexPage.php
@@ -182,6 +182,7 @@ class GlobalIndexPage {
}
}
+ usort($aMaps, Array('GlobalCore', 'cmpAlias'));
return json_encode($aMaps);
}
------------------------------------------------------------------------------
Why Cloud-Based Security and Archiving Make Sense
Osterman Research conducted this study that outlines how and why cloud
computing security and archiving is rapidly being adopted across the IT
space for its ease of implementation, lower cost, and increased
reliability. Learn more. http://www.accelacomm.com/jaw/sfnl/114/51425301/
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
