Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/classes-chunk.xql	22 Jan 2002 23:04:48 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/classes-chunk.xql	6 Mar 2002 22:35:15 -0000	1.2
@@ -1,24 +1,35 @@
 <?xml version="1.0"?>
 
 <queryset>
-  <fullquery name="select_classes">
-    <querytext>
-      select class_key,
-             pretty_name,
-             description
-      from dotlrn_classes_full
-      order by pretty_name
-    </querytext>
-  </fullquery>
+    <fullquery name="select_classes">
+        <querytext>
+            select dotlrn_classes_full.class_key,
+                   dotlrn_classes_full.pretty_name,
+                   dotlrn_classes_full.description,
+                   dotlrn_classes_full.department_key,
+                   dotlrn_departments_full.pretty_name as department_name
+            from dotlrn_classes_full,
+                 dotlrn_departments_full
+            where dotlrn_classes_full.department_key = dotlrn_departments_full.department_key
+            order by dotlrn_departments_full.pretty_name,
+                     dotlrn_classes_full.class_key,
+                     dotlrn_classes_full.pretty_name
+        </querytext>
+    </fullquery>
 
-  <fullquery name="select_classes_by_department">
-    <querytext>
-      select class_key,
-             pretty_name,
-             description
-      from dotlrn_classes_full
-      where department_key = :department_key
-      order by pretty_name
-    </querytext>
-  </fullquery>
+    <fullquery name="select_classes_by_department">
+        <querytext>
+            select dotlrn_classes_full.class_key,
+                   dotlrn_classes_full.pretty_name,
+                   dotlrn_classes_full.description,
+                   dotlrn_classes_full.department_key,
+                   dotlrn_departments_full.pretty_name as department_name
+            from dotlrn_classes_full,
+                 dotlrn_departments_full
+            where dotlrn_classes_full.department_key = :department_key
+            and dotlrn_classes_full.department_key = dotlrn_departments_full.department_key
+            order by dotlrn_classes_full.class_key,
+                     dotlrn_classes_full.pretty_name
+        </querytext>
+    </fullquery>
 </queryset>