Index: openacs-4/packages/curriculum-central/www/admin/faculties.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/faculties.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/curriculum-central/www/admin/faculties.tcl 4 Dec 2005 06:49:42 -0000 1.2 +++ openacs-4/packages/curriculum-central/www/admin/faculties.tcl 4 Dec 2005 07:34:26 -0000 1.3 @@ -45,7 +45,7 @@ -actions [list "#curriculum-central.add_faculty#" [export_vars -base faculty-ae {}] "#curriculum-central.add_faculty_to_list#"] \ -orderby { faculty_name {orderby {lower(faculty_name)}} - dean {orderby {lower(dean)}} + dean {orderby {dean_id}} } db_multirow faculties get_faculties {} Index: openacs-4/packages/curriculum-central/www/admin/faculty-depts.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/faculty-depts.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/curriculum-central/www/admin/faculty-depts.tcl 21 Nov 2005 05:27:59 -0000 1.4 +++ openacs-4/packages/curriculum-central/www/admin/faculty-depts.tcl 4 Dec 2005 07:34:26 -0000 1.5 @@ -58,7 +58,7 @@ "#curriculum-central.add_dept_to_list#"] \ -orderby { department_name {orderby {lower(department_name)}} - hod {orderby {lower(hod)}} + hod {orderby {hod_id}} } \ -pass_properties {faculty_id} \ -filters { faculty_id {} } Index: openacs-4/packages/curriculum-central/www/admin/staff-ae.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/staff-ae.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/curriculum-central/www/admin/staff-ae.tcl 4 Dec 2005 06:50:31 -0000 1.1 +++ openacs-4/packages/curriculum-central/www/admin/staff-ae.tcl 4 Dec 2005 07:34:26 -0000 1.2 @@ -29,7 +29,7 @@ ad_form -name staff -cancel_url $return_url -form { {staff_id:key,integer(select) {label "#curriculum-central.staff_name#" } - {options [curriculum_central::users_get_options] } + {options [curriculum_central::non_staff_get_options] } {help_text "[_ curriculum-central.help_select_staff_member]"} } } Index: openacs-4/packages/curriculum-central/www/admin/staff-del-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/staff-del-postgresql.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/curriculum-central/www/admin/staff-del-postgresql.xql 4 Dec 2005 07:34:26 -0000 1.1 @@ -0,0 +1,12 @@ + + + + postgresql7.4 + + + + SELECT cc_staff__delete(:staff_id) + + + + Index: openacs-4/packages/curriculum-central/www/admin/staff-del.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/staff-del.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/curriculum-central/www/admin/staff-del.tcl 4 Dec 2005 07:34:26 -0000 1.1 @@ -0,0 +1,29 @@ +ad_page_contract { + Deletes a user from the staff group and redirects back to listing of + staff. Able to specify a return_url if the default is not suitable. + + @param staff_id The ID of the user that needs to be removed from the + staff list. + @param return_url Optional url to redirect to when the delete operation + is complete. + + @author Nick Carroll (nick.c@rroll.net) + @creation-date 2005-12-04 + @cvs-id $Id: staff-del.tcl,v 1.1 2005/12/04 07:34:26 ncarroll Exp $ +} { + staff_id:integer + return_url:optional +} + +if { ![info exists return_url] } { + set return_url "staff" +} + +set package_id [ad_conn package_id] + +db_transaction { + db_exec_plsql staff_delete {} +} + +ad_returnredirect $return_url +ad_script_abort Index: openacs-4/packages/curriculum-central/www/admin/stream-ae.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/stream-ae.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/curriculum-central/www/admin/stream-ae.tcl 21 Nov 2005 04:28:38 -0000 1.2 +++ openacs-4/packages/curriculum-central/www/admin/stream-ae.tcl 4 Dec 2005 07:34:26 -0000 1.3 @@ -38,7 +38,7 @@ } {coordinator_id:integer(select) {label "#curriculum-central.stream_coordinator#" } - {options [curriculum_central::users_get_options] } + {options [curriculum_central::staff_get_options] } {help_text "[_ curriculum-central.help_select_stream_coordinator]"} } } -select_query { Index: openacs-4/packages/curriculum-central/www/admin/streams.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/streams.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/curriculum-central/www/admin/streams.tcl 30 Nov 2005 04:55:20 -0000 1.2 +++ openacs-4/packages/curriculum-central/www/admin/streams.tcl 4 Dec 2005 07:34:26 -0000 1.3 @@ -55,8 +55,8 @@ -orderby { stream_name {orderby {lower(stream_name)}} stream_code {orderby {lower(stream_code)}} - department {orderby {lower(department)}} - stream_coordinator {orderby {lower(stream_coordinator)}} + department {orderby {department_id}} + stream_coordinator {orderby {coordinator_id}} } db_multirow streams get_streams {}