Merge pull request #162 from ahelsing/tkt140-sortwl

Issue #140: Sort whitelisted domains by domain name
GENI-NSF · Jul 18, 2016 · deaafe4 · deaafe4
2 parents 418d803 + 108e99d
commit deaafe4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,8 @@
 
 # [Release 1.8](https://github.com/GENI-NSF/geni-ar/milestones/1.8)
 
+* Sort whitelisted institutions.
+  ([#140](https://github.com/GENI-NSF/geni-ar/issues/140))
 * Check that phone numbers use only legal characters.
   ([#146](https://github.com/GENI-NSF/geni-ar/issues/146))
 * Add link to page to manage whitelisted domains.

diff --git a/protected/whitelist.php b/protected/whitelist.php
@@ -63,7 +63,7 @@ function delete_from_whitelist($institutions) {
 
 function print_whitelist() {
     $db_conn = db_conn();
-    $sql = "SELECT * from idp_whitelist";
+    $sql = "SELECT * from idp_whitelist ORDER BY institution";
     $db_result = db_fetch_rows($sql, "read idp_whitelist");
 
     if ($db_result[RESPONSE_ARGUMENT::CODE] == RESPONSE_ERROR::NONE) {