admin/mnet/mnet_services: Concatenated query to sidestep Moodle

requirement that firest field of resultset is unique

Author: Donal McMullan <donal@catalyst.net.nz>

diff --git a/admin/mnet/mnet_services.php b/admin/mnet/mnet_services.php
index 9f131f0a4a5c8e11d7a4607c4c357e432b1dccac..b90f43fbe7e5c0cd802ff882ac5a6c9d896ec1bf 100644 (file)
--- a/admin/mnet/mnet_services.php
+++ b/admin/mnet/mnet_services.php
@@ -74,9 +74,11 @@
             $id_list .= ', '.$CFG->mnet_all_hosts_id;
         }
 
+        $concat = sql_concat('COALESCE(h2s.id,0) ', ' \'-\' ', ' svc.id');
+
         $query = "
             SELECT DISTINCT
-                h2s.id,
+                $concat as id,
                 svc.id as serviceid,
                 svc.name,
                 svc.offer,