Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/dotlrn/dotlrn.info 6 Dec 2001 20:50:51 -0000 1.19
+++ openacs-4/packages/dotlrn/dotlrn.info 11 Dec 2001 00:27:58 -0000 1.20
@@ -64,6 +64,8 @@
+
+
@@ -87,24 +89,35 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -151,12 +164,12 @@
-
-
-
+
+
+
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-users-create.sql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-create.sql 1 Dec 2001 23:16:27 -0000 1.6
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-create.sql 11 Dec 2001 00:27:59 -0000 1.7
@@ -67,14 +67,14 @@
/
show errors
-create view dotlrn_users as select acs_rels.rel_id, registered_users.user_id, first_names, last_name, email, type
+create view dotlrn_users as select acs_rels.rel_id, registered_users.user_id, first_names, last_name, email, dotlrn_user_types.type_id, type
from dotlrn_user_rels, acs_rels, registered_users, dotlrn_user_types where
acs_rels.object_id_two = registered_users.user_id and
acs_rels.object_id_one = dotlrn_get_group_id() and
acs_rels.rel_id = dotlrn_user_rels.rel_id and
dotlrn_user_rels.type_id= dotlrn_user_types.type_id;
-create view dotlrn_full_users as select acs_rels.rel_id, registered_users.user_id, first_names, last_name, email, type, portal_id, theme_id
+create view dotlrn_full_users as select acs_rels.rel_id, registered_users.user_id, first_names, last_name, email, dotlrn_user_types.type_id, type, portal_id, theme_id
from dotlrn_user_rels, dotlrn_full_user_rels, acs_rels, registered_users, dotlrn_user_types where
acs_rels.object_id_two = registered_users.user_id and
acs_rels.object_id_one = dotlrn_get_group_id() and
Index: openacs-4/packages/dotlrn/www/community-user-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-user-add-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/community-user-add-2.tcl 3 Dec 2001 02:51:27 -0000 1.3
+++ openacs-4/packages/dotlrn/www/community-user-add-2.tcl 11 Dec 2001 00:27:59 -0000 1.4
@@ -11,7 +11,7 @@
set community_id [dotlrn_community::get_community_id]
# Get user information
-db_1row select_user_info "select first_names, last_name, email from dotlrn_full_users where user_id=:user_id"
+db_1row select_user_info "select first_names, last_name, email from dotlrn_users where user_id=:user_id"
# Depending on the community_type, we have allowable rel_types
set rel_types [dotlrn_community::get_allowed_rel_types -community_id $community_id]
Index: openacs-4/packages/dotlrn/www/community-user-add.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-user-add.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/community-user-add.xql 3 Dec 2001 02:51:27 -0000 1.2
+++ openacs-4/packages/dotlrn/www/community-user-add.xql 11 Dec 2001 00:27:59 -0000 1.3
@@ -4,7 +4,7 @@
-select user_id, first_names, last_name, email from dotlrn_full_users where lower(last_name) like lower('%' || :search_text || '%') or lower(email) like lower('%' || :search_text || '%') and user_id not in (select user_id from dotlrn_member_rels_full where community_id= :community_id)
+select user_id, first_names, last_name, email from dotlrn_users where lower(last_name) like lower('%' || :search_text || '%') or lower(email) like lower('%' || :search_text || '%') and user_id not in (select user_id from dotlrn_member_rels_full where community_id= :community_id)
Index: openacs-4/packages/dotlrn/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/index.tcl 8 Dec 2001 01:22:40 -0000 1.13
+++ openacs-4/packages/dotlrn/www/index.tcl 11 Dec 2001 00:27:59 -0000 1.14
@@ -21,16 +21,29 @@
# Make sure user is logged in
set user_id [ad_maybe_redirect_for_registration]
-# Get the page
-set portal_id [dotlrn::get_workspace_portal_id $user_id]
+# Permission dotLRN
+if {![dotlrn::user_can_browse_p]} {
+ ns_log Notice "DOTLRN- CANNOT BROWSE!"
-# If there is no portal_id, this user is either a guest or something else
-if {[empty_string_p $portal_id]} {
- # do something
- ad_return_template index-not-a-user
+ # Figure out if the user is a member of a community
+ set communities [dotlrn_community::get_all_communities_by_user $user_id]
+
+ if {[llength $communities] == 0} {
+ ad_return_template index-not-a-user
+ return
+ }
+
+ # For now, we assume only ONE community (FIXME: ben)
+ set the_community [lindex $communities 0]
+ ad_returnredirect [dotlrn_community::get_url_from_package_id -package_id [lindex $the_community 4]]
+
+ ad_script_abort
return
-} else {
- set rendered_page [dotlrn::render_page $portal_id]
}
+# Get the page
+set portal_id [dotlrn::get_workspace_portal_id $user_id]
+
+set rendered_page [dotlrn::render_page $portal_id]
+
ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/user-new-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-new-2.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/user-new-2.adp 10 Dec 2001 23:58:31 -0000 1.4
+++ openacs-4/packages/dotlrn/www/admin/user-new-2.adp 11 Dec 2001 00:27:59 -0000 1.5
@@ -1,5 +1,6 @@
dotLRN Admin: Add a User
+@context_bar@
You've chosen to add @first_names@ @last_name@.
Index: openacs-4/packages/dotlrn/www/admin/user-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-new-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/user-new-2.tcl 10 Dec 2001 23:58:31 -0000 1.5
+++ openacs-4/packages/dotlrn/www/admin/user-new-2.tcl 11 Dec 2001 00:27:59 -0000 1.6
@@ -39,5 +39,6 @@
db_1row select_user_info "select first_names,last_name from registered_users where user_id= :user_id"
+set context_bar {{users Users} New}
ad_return_template