Index: openacs-4/packages/curriculum-central/www/coordinate/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/index.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/curriculum-central/www/coordinate/index.adp	16 Jun 2006 02:21:04 -0000	1.17
+++ openacs-4/packages/curriculum-central/www/coordinate/index.adp	22 Jun 2006 08:27:12 -0000	1.18
@@ -15,13 +15,13 @@
 </ul>
 
 <ul>
-<li><a href="uos-all">#curriculum-central.view_all_uos#</a></li>
 <li><a href="uos-add">#curriculum-central.add_unit_of_study#</a></li>
 <li><a href="uos-all-pending">#curriculum-central.all_pending_units_of_study#</a> (@num_all_pending@ #curriculum-central.pending#)</li>
 </ul>
 </if>
 
 <h3>#curriculum-central.uos_administration#</h3>
 <ul>
+<li><a href="uos-all">#curriculum-central.view_all_uos#</a></li>
 <li><a href="uos-pending">#curriculum-central.your_pending_units_of_study#</a> (@num_users_pending@ #curriculum-central.pending#)</li>
 </ul>
Index: openacs-4/packages/curriculum-central/www/coordinate/uos-all-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-all-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/uos-all-postgresql.xql	2 Feb 2006 11:52:15 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/uos-all-postgresql.xql	22 Jun 2006 08:27:12 -0000	1.2
@@ -20,4 +20,22 @@
       </querytext>
     </fullquery>
 
+    <fullquery name="get_all_uc_uos">
+      <querytext>
+        SELECT n.uos_code, n.uos_name, u.uos_id, u.unit_coordinator_id,
+	    s.short_name, s.pretty_name
+        FROM cc_uos u,
+	    cc_uos_name n,
+	    workflow_cases c,
+	    workflow_case_fsm f,
+	    workflow_fsm_states s
+	WHERE c.case_id = f.case_id
+	AND s.state_id = f.current_state
+	AND c.workflow_id = :workflow_id
+	AND u.uos_id = c.object_id
+	AND u.unit_coordinator_id = :user_id
+	AND n.name_id = u.uos_name_id
+      </querytext>
+    </fullquery>
+
 </queryset>
Index: openacs-4/packages/curriculum-central/www/coordinate/uos-all.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-all.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/coordinate/uos-all.tcl	2 Feb 2006 11:52:15 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/coordinate/uos-all.tcl	22 Jun 2006 08:27:12 -0000	1.2
@@ -44,9 +44,16 @@
     -no_data "#curriculum-central.no_uos_have_been_created#" \
     -elements $elements
 
-db_multirow -extend {unit_coordinator} all_uos get_all_uos {} {
-    set unit_coordinator [curriculum_central::staff::pretty_name $unit_coordinator_id]
+# If stream coordinator, then list all UoS, otherwise list all UoS that the
+# user is the unit coordinator of.
+if { [curriculum_central::staff::stream_coordinator_p $user_id] } {
+    db_multirow -extend {unit_coordinator} all_uos get_all_uos {} {
+	set unit_coordinator [curriculum_central::staff::pretty_name $unit_coordinator_id]
+    }
+} else {
+    db_multirow -extend {unit_coordinator} all_uos get_all_uc_uos {} {
+	set unit_coordinator [curriculum_central::staff::pretty_name $unit_coordinator_id]
+    }
 }
 
-
 ad_return_template