Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl 19 Jan 2002 18:32:00 -0000 1.31
+++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl 20 Jan 2002 17:20:44 -0000 1.32
@@ -8,12 +8,12 @@
#
ad_library {
-
+
Procs for basic dotLRN
-
+
@author ben@openforce.net
@creation-date 2001-08-18
-
+
}
namespace eval dotlrn {
@@ -62,7 +62,7 @@
} {
returns 1 if dotlrn is instantiaed under the url specified, 0
otherwise
-
+
XXX - aks - I think there a bug in here somewhere - use the
procs in site_nodes:: instead. Thanks.
} {
@@ -120,9 +120,9 @@
for {set x 1} {$x < [llength $package_list]} {incr x 2} {
array set package_info [lindex $package_list $x]
-
+
# ns_log notice "is_package_mounted: [array get package_info]"
-
+
if {[site_node_closest_ancestor_package -default 0 -url $package_info(url) "dotlrn"] != 0} {
set dotlrn_ancestor_p 1
@@ -202,7 +202,7 @@
} {
return [db_string select_user_rel_segment {}]
}
-
+
ad_proc -public get_user_theme {
user_id
} {
@@ -219,7 +219,7 @@
} {
db_dml update_user_theme {}
}
-
+
ad_proc -public get_workspace_portal_id {
user_id
} {
@@ -273,4 +273,11 @@
return [portal::render -hide_links_p $hide_links_p -render_style $render_style $portal_id $theme_id]
}
+ ad_proc -public get_user_type_id_from_type {
+ -type
+ } {
+ return the type_id of a dotlrn_user type
+ } {
+ return [db_string select_user_type_id_from_type {} -default ""]
+ }
}
Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-procs.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs.xql 3 Dec 2001 02:51:27 -0000 1.7
+++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.xql 20 Jan 2002 17:20:44 -0000 1.8
@@ -38,4 +38,12 @@
+
+
+ select type_id
+ from dotlrn_user_types
+ where type = :type
+
+
+
Index: openacs-4/packages/dotlrn/www/one-community-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/www/one-community-admin.adp 20 Jan 2002 06:11:04 -0000 1.10
+++ openacs-4/packages/dotlrn/www/one-community-admin.adp 20 Jan 2002 17:20:45 -0000 1.11
@@ -25,11 +25,11 @@
| waitwait
- Add a Limited Access user to this community
+ Add a Limited Access user to this community
- This allows you to register new users and give them access to just this community.
- Add a Limited Access Guest user to this community
+ Add a Limited Access Guest user to this community
- This allows you to register new non-MIT users and give them access to just this community.
Information about students who are part of this community will not be available to this user.
Index: openacs-4/packages/dotlrn/www/user-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/user-add.tcl 19 Jan 2002 22:54:20 -0000 1.1
+++ openacs-4/packages/dotlrn/www/user-add.tcl 20 Jan 2002 17:20:45 -0000 1.2
@@ -8,7 +8,7 @@
@cvs-id $Id$
} -query {
{referer "members"}
- {type_id "1"}
+ {type "student"}
{rel_type "dotlrn_full_user_rel"}
{read_private_data_p "t"}
} -properties {
@@ -50,21 +50,21 @@
element create add_user rel_type \
-label "Rel Type" -value $rel_type -datatype text -widget hidden
-element create add_user type_id \
- -label "Type ID" -value $type_id -datatype text -widget hidden
+element create add_user type \
+ -label "Type" -value $type -datatype text -widget hidden
element create add_user read_private_data_p \
-label "Can Read Private Data" -value $read_private_data_p -datatype text -widget hidden
if {[form is_valid add_user]} {
- template::form get_values add_user target_user_id email first_names last_name referer rel_type type_id read_private_data_p
+ template::form get_values add_user target_user_id email first_names last_name referer rel_type type read_private_data_p
db_transaction {
# create the ACS user
set target_user_id [ad_user_new $email $first_names $last_name [ad_generate_random_string] "" "" "" "t" "approved" $target_user_id]
# make the user a dotLRN user
- dotlrn::user_add -rel_type $rel_type -user_id $target_user_id -type_id $type_id
+ dotlrn::user_add -rel_type $rel_type -user_id $target_user_id -type_id [dotrln::get_user_type_id_from_type -type $type]
# can this user read private data?
acs_privacy::set_user_read_private_data -user_id $target_user_id -object_id [dotlrn::get_package_id] -value $read_private_data_p
Index: openacs-4/packages/dotlrn/www/admin/add-instructor-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/add-instructor-3.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/add-instructor-3.tcl 10 Jan 2002 21:19:32 -0000 1.1
+++ openacs-4/packages/dotlrn/www/admin/add-instructor-3.tcl 20 Jan 2002 17:20:45 -0000 1.2
@@ -15,7 +15,7 @@
# if the user isn't already a dotLRN user make him so
if {!${is_dotlrn_user}} {
- dotlrn::user_add -rel_type dotlrn_full_user_rel -user_id $user_id -type_id 2
+ dotlrn::user_add -rel_type dotlrn_full_user_rel -user_id $user_id -type_id [dotlrn::get_user_type_id_from_type -type "professor"]
acs_privacy::set_user_read_private_data -user_id $user_id -object_id [dotlrn_community::get_package_id $community_id] -value "t"
}