+
-select page_id from dotlrn_users where user_id= :user_id
+select portal_id from dotlrn_full_users where user_id= :user_id
Index: openacs-4/packages/dotlrn/www/one-community-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-type.adp,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/one-community-type.adp 28 Nov 2001 00:11:48 -0000 1.9
+++ openacs-4/packages/dotlrn/www/one-community-type.adp 1 Dec 2001 23:16:27 -0000 1.10
@@ -6,13 +6,6 @@
@description@
-Communities You're a Member Of
-
-
Index: openacs-4/packages/dotlrn/www/one-community-type.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-type.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/one-community-type.tcl 27 Nov 2001 23:32:03 -0000 1.5
+++ openacs-4/packages/dotlrn/www/one-community-type.tcl 1 Dec 2001 23:16:27 -0000 1.6
@@ -23,21 +23,13 @@
# Check what communities of this type the user is a member of
# cause we want to display that!
-set list_of_communities [dotlrn_community::get_communities_by_user $community_type $user_id]
+set member_communities [dotlrn_community::get_communities_by_user $community_type $user_id]
-# communities should be a data source
-template::multirow create communities community_id community_type pretty_name description url
-
-# Loop and create the data source (I am very unhappy with db_multirow. VERY - bma)
-foreach comm $list_of_communities {
- template::multirow append communities [lindex $comm 0] [lindex $comm 1] [lindex $comm 2] [lindex $comm 3] [lindex $comm 4]
-}
-
# Load all active communities for this community type
set list_of_active_communities [dotlrn_community::get_active_communities $community_type]
# data source
-template::multirow create active_communities community_id community_type pretty_name description url admin_p
+template::multirow create active_communities community_id community_type pretty_name description url admin_p member_p
# Loop and create the data source (I am very unhappy with db_multirow. VERY - bma)
foreach comm $list_of_active_communities {
@@ -48,7 +40,13 @@
set admin_p 0
}
- template::multirow append active_communities [lindex $comm 0] [lindex $comm 1] [lindex $comm 2] [lindex $comm 3] [lindex $comm 4] $admin_p
+ if {[lsearch [lindex $comm 0] $member_communities]} {
+ set member_p 1
+ } else {
+ set member_p 0
+ }
+
+ template::multirow append active_communities [lindex $comm 0] [lindex $comm 1] [lindex $comm 2] [lindex $comm 3] [lindex $comm 4] $admin_p $member_p
}
set context_bar {View}
Index: openacs-4/packages/dotlrn/www/one-community.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/one-community.tcl 28 Nov 2001 00:11:48 -0000 1.7
+++ openacs-4/packages/dotlrn/www/one-community.tcl 1 Dec 2001 23:16:27 -0000 1.8
@@ -25,11 +25,11 @@
if {![dotlrn_community::member_p $community_id $user_id]} {
set context_bar [list "Not a member"]
- set page_id [dotlrn_community::get_community_non_members_page_id $community_id]
+ set portal_id [dotlrn_community::get_community_non_members_portal_id $community_id]
# Possible that there is no portal page for non-members
- if {! [empty_string_p $page_id]} {
- set rendered_page [dotlrn::render_page $page_id]
+ if {! [empty_string_p $portal_id]} {
+ set rendered_page [dotlrn::render_page $portal_id]
} else {
set rendered_page ""
}
@@ -38,9 +38,9 @@
return
} else {
# Pull out the NPP page ID and render it!
- set page_id [dotlrn_community::get_page_id $community_id $user_id]
+ set portal_id [dotlrn_community::get_portal_id $community_id $user_id]
- set rendered_page [dotlrn::render_page $page_id]
+ set rendered_page [dotlrn::render_page $portal_id]
set context_bar {View}
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 -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/user-new-2.adp 27 Nov 2001 23:16:32 -0000 1.2
+++ openacs-4/packages/dotlrn/www/admin/user-new-2.adp 1 Dec 2001 23:16:27 -0000 1.3
@@ -4,18 +4,7 @@
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 -N -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/user-new-2.tcl 10 Nov 2001 18:03:23 -0000 1.3
+++ openacs-4/packages/dotlrn/www/admin/user-new-2.tcl 1 Dec 2001 23:16:27 -0000 1.4
@@ -8,6 +8,28 @@
user_id
}
+form create add_user
+
+element create add_user user_id \
+ -label "User ID" -datatype integer -widget hidden -value $user_id
+
+element create add_user type_id \
+ -label "User Type" -datatype text -widget select -options [dotlrn::get_user_types]
+
+element create add_user rel_type \
+ -label "Access" -datatype text -widget select -options {{{Limited Access} dotlrn_user_rel} {{Full Access} dotlrn_full_user_rel}}
+
+if {[form is_valid add_user]} {
+ template::form get_values add_user user_id type_id rel_type
+
+ # add the user
+ dotlrn::user_add -rel_type $rel_type -user_id $user_id -type_id $type_id
+
+ # redirect
+ ad_returnredirect "users"
+ return
+}
+
db_1row select_user_info "select first_names,last_name from registered_users where user_id= :user_id"
ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/user-new-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/user-new-3.tcl,v
diff -u -N
--- openacs-4/packages/dotlrn/www/admin/user-new-3.tcl 27 Nov 2001 23:16:32 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-
-ad_page_contract {
- Add an actual user
-
- @author Ben Adida (ben@openforce.net)
- @creation-date 2001-11-04
-} {
- user_id
- {role student}
-}
-
-# Add the user
-dotlrn::user_add -role $role $user_id
-
-ad_returnredirect "users"
-
Index: openacs-4/packages/dotlrn/www/admin/users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/users.adp 29 Nov 2001 06:05:37 -0000 1.3
+++ openacs-4/packages/dotlrn/www/admin/users.adp 1 Dec 2001 23:16:27 -0000 1.4
@@ -5,7 +5,7 @@
dotLRN users
-- @users.last_name@, @users.first_names@ (@users.email@) - @users.role@
+
- @users.last_name@, @users.first_names@ (@users.email@) - @users.type@
Index: openacs-4/packages/dotlrn/www/admin/users.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/users.xql 10 Nov 2001 18:03:23 -0000 1.2
+++ openacs-4/packages/dotlrn/www/admin/users.xql 1 Dec 2001 23:16:27 -0000 1.3
@@ -4,7 +4,7 @@
-select first_names, last_name, email, role from dotlrn_users_full order by last_name
+select first_names, last_name, email, type from dotlrn_users order by last_name
Index: openacs-4/packages/dotlrn-bboard/tcl/dotlrn-bboard-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bboard/tcl/dotlrn-bboard-procs.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/dotlrn-bboard/tcl/dotlrn-bboard-procs.tcl 29 Nov 2001 22:49:19 -0000 1.9
+++ openacs-4/packages/dotlrn-bboard/tcl/dotlrn-bboard-procs.tcl 1 Dec 2001 23:16:41 -0000 1.10
@@ -109,8 +109,8 @@
} {
Add a user to a specific dotlrn community
} {
- # Get the page_id by callback
- set page_id [dotlrn_community::get_page_id $community_id $user_id]
+ # Get the portal_id by callback
+ set portal_id [dotlrn_community::get_portal_id $community_id $user_id]
# Get the package_id by callback
set package_id [dotlrn_community::get_applet_package_id $community_id dotlrn_bboard]
@@ -119,16 +119,16 @@
# nothing for now
# Make bboard DS available to this page
- bboard_portlet::make_self_available $page_id
+ bboard_portlet::make_self_available $portal_id
# Call the portal element to be added correctly
- bboard_portlet::add_self_to_page $page_id $package_id
+ bboard_portlet::add_self_to_page $portal_id $package_id
# Now for the user workspace
- set workspace_page_id [dotlrn_community::get_workspace_page_id $user_id]
+ set workspace_portal_id [dotlrn::get_workspace_portal_id $user_id]
# Add the portlet here
- bboard_portlet::add_self_to_page $workspace_page_id $package_id
+ bboard_portlet::add_self_to_page $workspace_portal_id $package_id
}
ad_proc -public remove_user {
@@ -137,26 +137,26 @@
} {
Remove a user from a community
} {
- # Get the page_id
- set page_id [dotlrn_community::get_page_id $community_id $user_id]
+ # Get the portal_id
+ set portal_id [dotlrn_community::get_portal_id $community_id $user_id]
# Get the package_id by callback
set package_id [dotlrn_community::get_applet_package_id $community_id [applet_key]]
# Remove the portal element
- bboard_portlet::remove_self_from_page $page_id $package_id
+ bboard_portlet::remove_self_from_page $portal_id $package_id
# Buh Bye.
- bboard_portlet::make_self_unavailable $page_id
+ bboard_portlet::make_self_unavailable $portal_id
# remove user permissions to see bboards
# nothing to do here
# Remove from the main workspace
- set workspace_page_id [dotlrn_community::get_workspace_page_id $user_id]
+ set workspace_portal_id [dotlrn::get_workspace_portal_id $user_id]
# Add the portlet here
- bboard_portlet::remove_self_from_page $workspace_page_id $package_id
+ bboard_portlet::remove_self_from_page $workspace_portal_id $package_id
}
}
Index: openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl 29 Nov 2001 23:11:12 -0000 1.9
+++ openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl 1 Dec 2001 23:16:46 -0000 1.10
@@ -113,11 +113,10 @@
# set calendar_id [calendar_create $user_id "t" $community_name]
# add this PE to the user's workspace!
- set workspace_page_id [dotlrn_community::get_workspace_page_id $user_id]
- # Add the portlet here
- calendar_portlet::add_self_to_page $workspace_page_id $calendar_id
+ set workspace_portal_id [dotlrn::get_workspace_portal_id $user_id]
-
+ # Add the portlet here
+ calendar_portlet::add_self_to_page $workspace_portal_id $calendar_id
}
ad_proc -public add_user_to_community {
@@ -133,12 +132,12 @@
# aks XXX
# add the portlet, to this user's community portal
- set page_id [dotlrn_community::get_page_id $community_id $user_id]
+ set portal_id [dotlrn_community::get_portal_id $community_id $user_id]
# Add the calendar DS to the user's community portal.
# This will copy the params from the portal template if exists
- calendar_portlet::make_self_available $page_id
- calendar_portlet::add_self_to_page $page_id $calendar_id
+ calendar_portlet::make_self_available $portal_id
+ calendar_portlet::add_self_to_page $portal_id $calendar_id
# temporary hack by ben to make calendar unique (FIXME)
set calendar_id [calendar_create $user_id "t" "$community_name-$user_id"]
@@ -157,17 +156,17 @@
} {
Remove a user from a community
} {
- # Get the page_id
- set page_id [dotlrn_community::get_page_id $community_id $user_id]
+ # Get the portal_id
+ set portal_id [dotlrn_community::get_portal_id $community_id $user_id]
# Get the package_id by callback
set package_id [dotlrn_community::get_package_id $community_id]
# Remove the portal element
- calendar_portlet::remove_self_from_page $page_id $package_id
+ calendar_portlet::remove_self_from_page $portal_id $package_id
# Buh Bye.
- calendar_portlet::make_self_unavailable $page_id
+ calendar_portlet::make_self_unavailable $portal_id
# remove user permissions to see calendar folders
# nothing to do here
Index: openacs-4/packages/dotlrn-dotlrn/tcl/dotlrn-dotlrn-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-dotlrn/tcl/dotlrn-dotlrn-procs.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/dotlrn-dotlrn/tcl/dotlrn-dotlrn-procs.tcl 30 Nov 2001 17:56:58 -0000 1.8
+++ openacs-4/packages/dotlrn-dotlrn/tcl/dotlrn-dotlrn-procs.tcl 1 Dec 2001 23:18:16 -0000 1.9
@@ -56,12 +56,12 @@
# No mounting of anything
# Non-member page stuff
- # Get the non-member page_id
- set page_id [dotlrn_community::get_community_non_members_page_id $community_id]
+ # Get the non-member portal_id
+ set portal_id [dotlrn_community::get_community_non_members_portal_id $community_id]
# Add the element there, too
- dotlrn_portlet::make_self_available $page_id
- dotlrn_portlet::add_self_to_page $page_id $community_id
+ dotlrn_portlet::make_self_available $portal_id
+ dotlrn_portlet::add_self_to_page $portal_id $community_id
# portal template stuff
# get the portal_template_id
@@ -105,15 +105,15 @@
} {
Called when a user is added to a spceific dotlrn community
} {
- # Get the page_id by callback
- set page_id [dotlrn_community::get_page_id $community_id $user_id]
+ # Get the portal_id by callback
+ set portal_id [dotlrn_community::get_portal_id $community_id $user_id]
# Allow user to see the dotlrn forums
# nothing for now
# Make dotlrn DS available to this page
- dotlrn_portlet::make_self_available $page_id
- dotlrn_portlet::add_self_to_page $page_id $community_id
+ dotlrn_portlet::make_self_available $portal_id
+ dotlrn_portlet::add_self_to_page $portal_id $community_id
}
ad_proc -public remove_user {
@@ -122,17 +122,17 @@
} {
Remove a user from a community
} {
- # Get the page_id
- set page_id [dotlrn_community::get_page_id $community_id $user_id]
+ # Get the portal_id
+ set portal_id [dotlrn_community::get_portal_id $community_id $user_id]
# Get the package_id by callback
# set package_id [dotlrn_community::get_package_id $community_id]
# Remove the portal element
- dotlrn_portlet::remove_self_from_page $page_id $community_id
+ dotlrn_portlet::remove_self_from_page $portal_id $community_id
# Buh Bye.
- dotlrn_portlet::make_self_unavailable $page_id
+ dotlrn_portlet::make_self_unavailable $portal_id
# remove user permissions to see dotlrns
# nothing to do here
Index: openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl 30 Nov 2001 18:12:57 -0000 1.7
+++ openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl 1 Dec 2001 23:17:01 -0000 1.8
@@ -98,8 +98,8 @@
} {
Called when a user is added to a specific dotlrn community
} {
- # Get the page_id by callback
- set page_id [dotlrn_community::get_page_id $community_id $user_id]
+ # Get the portal_id by callback
+ set portal_id [dotlrn_community::get_portal_id $community_id $user_id]
# Get the faq applet's package_id by callback
set package_id [dotlrn_community::get_applet_package_id $community_id dotlrn_faq]
@@ -108,10 +108,10 @@
# nothing for now
# Make faq DS available to this page
- faq_portlet::make_self_available $page_id
+ faq_portlet::make_self_available $portal_id
# Call the portal element to be added correctly
- faq_portlet::add_self_to_page $page_id $package_id
+ faq_portlet::add_self_to_page $portal_id $package_id
}
ad_proc -public remove_user {
@@ -120,17 +120,17 @@
} {
Remove a user from a community
} {
- # Get the page_id
- set page_id [dotlrn_community::get_page_id $community_id $user_id]
+ # Get the portal_id
+ set portal_id [dotlrn_community::get_portal_id $community_id $user_id]
# Get the package_id by callback
set package_id [dotlrn_community::get_package_id $community_id]
# Remove the portal element
- faq_portlet::remove_self_from_page $page_id $package_id
+ faq_portlet::remove_self_from_page $portal_id $package_id
# Buh Bye.
- faq_portlet::make_self_unavailable $page_id
+ faq_portlet::make_self_unavailable $portal_id
# remove user permissions to see faqs
# nothing to do here
Index: openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl 30 Nov 2001 18:18:01 -0000 1.10
+++ openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl 1 Dec 2001 23:16:53 -0000 1.11
@@ -80,11 +80,11 @@
# FIXME: Set up permissions on this folder
# non-member page stuff
- # Get non member page_id
- set non_member_page_id [dotlrn_community::get_community_non_members_page_id $community_id]
+ # Get non member portal_id
+ set non_member_portal_id [dotlrn_community::get_community_non_members_portal_id $community_id]
# Make file storage available public-folder only at community non-member page
- fs_portlet::add_self_to_page $non_member_page_id $package_id $public_folder_id
+ fs_portlet::add_self_to_page $non_member_portal_id $package_id $public_folder_id
# portal template stuff
# get the portal_template_id by callback
@@ -136,8 +136,8 @@
} {
Add a user to a to a specifc dotlrn community
} {
- # Get the page_id by callback
- set page_id [dotlrn_community::get_page_id $community_id $user_id]
+ # Get the portal_id by callback
+ set portal_id [dotlrn_community::get_portal_id $community_id $user_id]
# Get the package_id by callback
set package_id [dotlrn_community::get_applet_package_id $community_id dotlrn_fs]
@@ -150,7 +150,7 @@
set folder_id [fs_get_root_folder -package_id $package_id]
# Make file storage available at community-user page level
- fs_portlet::add_self_to_page $page_id $package_id $folder_id
+ fs_portlet::add_self_to_page $portal_id $package_id $folder_id
}
ad_proc -public remove_user {
@@ -159,17 +159,17 @@
} {
Remove a user from a community
} {
- # Get the page_id
- set page_id [dotlrn_community::get_page_id $community_id $user_id]
+ # Get the portal_id
+ set portal_id [dotlrn_community::get_portal_id $community_id $user_id]
# Get the package_id by callback
set package_id [dotlrn_community::get_package_id $community_id]
# Remove the portal element
- fs_portlet::remove_self_from_page $page_id $package_id
+ fs_portlet::remove_self_from_page $portal_id $package_id
# Buh Bye.
- fs_portlet::make_self_unavailable $page_id
+ fs_portlet::make_self_unavailable $portal_id
# remove user permissions to see fs folders
# nothing to do here
Index: openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl 30 Nov 2001 18:21:30 -0000 1.4
+++ openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl 1 Dec 2001 23:18:08 -0000 1.5
@@ -99,8 +99,8 @@
} {
# ad_return_complaint 1 "$community_id $user_id"
- # Get the page_id by callback
- set page_id [dotlrn_community::get_page_id $community_id $user_id]
+ # Get the portal_id by callback
+ set portal_id [dotlrn_community::get_portal_id $community_id $user_id]
# Get the package_id by callback
set package_id [dotlrn_community::get_applet_package_id $community_id dotlrn_news]
@@ -112,9 +112,9 @@
# Make news DS available to this page
- news_portlet::make_self_available $page_id
+ news_portlet::make_self_available $portal_id
- news_portlet::add_self_to_page $page_id $package_id
+ news_portlet::add_self_to_page $portal_id $package_id
}
ad_proc -public remove_user {
@@ -123,17 +123,17 @@
} {
Remove a user from a community
} {
- # Get the page_id
- set page_id [dotlrn_community::get_page_id $community_id $user_id]
+ # Get the portal_id
+ set portal_id [dotlrn_community::get_portal_id $community_id $user_id]
# Get the package_id by callback
set package_id [dotlrn_community::get_package_id $community_id]
# Remove the portal element
- news_portlet::remove_self_from_page $page_id $package_id
+ news_portlet::remove_self_from_page $portal_id $package_id
# Buh Bye.
- news_portlet::make_self_unavailable $page_id
+ news_portlet::make_self_unavailable $portal_id
# remove user permissions to see news folders
# nothing to do here
Index: openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl 17 Nov 2001 23:49:03 -0000 1.14
+++ openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl 1 Dec 2001 23:18:40 -0000 1.15
@@ -32,20 +32,20 @@
ad_proc -public add_self_to_page {
- page_id
+ portal_id
community_id
} {
Adds a dotlrn PE to the given page with the community_id as
opaque data in the portal configuration.
@return element_id The new element's id
- @param page_id The page to add self to
+ @param portal_id The page to add self to
@param community_id The dotlrn community to show info about
@author arjun@openforce.net
@creation-date Sept 2001
} {
# Tell portal to add this element to the page
- set element_id [portal::add_element_to_region $page_id [my_name] 2]
+ set element_id [portal::add_element_to_region $portal_id [my_name] 2]
# The default param must be configured
set key "community_id"
@@ -100,7 +100,7 @@
} {
Removes a dotlrn PE from the given page
- @param page_id The page to remove self from
+ @param portal_id The page to remove self from
@param community_id
@author arjun@openforce.net
@creation-date Sept 2001
@@ -123,29 +123,29 @@
}
ad_proc -public make_self_available {
- page_id
+ portal_id
} {
Wrapper for the portal:: proc
- @param page_id
+ @param portal_id
@author arjun@openforce.net
@creation-date Nov 2001
} {
portal::make_datasource_available \
- $page_id [portal::get_datasource_id [my_name]]
+ $portal_id [portal::get_datasource_id [my_name]]
}
ad_proc -public make_self_unavailable {
- page_id
+ portal_id
} {
Wrapper for the portal:: proc
- @param page_id
+ @param portal_id
@author arjun@openforce.net
@creation-date Nov 2001
} {
portal::make_datasource_unavailable \
- $page_id [portal::get_datasource_id [my_name]]
+ $portal_id [portal::get_datasource_id [my_name]]
}
}
Index: openacs-4/packages/faq-portlet/tcl/faq-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/tcl/faq-portlet-procs.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/faq-portlet/tcl/faq-portlet-procs.tcl 19 Nov 2001 14:59:48 -0000 1.13
+++ openacs-4/packages/faq-portlet/tcl/faq-portlet-procs.tcl 1 Dec 2001 23:18:44 -0000 1.14
@@ -31,20 +31,20 @@
}
ad_proc -public add_self_to_page {
- page_id
+ portal_id
package_id
} {
Adds a faq PE to the given page with the package_id
being opaque data in the portal configuration.
@return element_id The new element's id
- @param page_id The page to add self to
+ @param portal_id The page to add self to
@param package_id the id of the faq package for this community
@author arjun@openforce.net
@creation-date Sept 2001
} {
# Tell portal to add this element to the page
- set element_id [portal::add_element $page_id [my_name]]
+ set element_id [portal::add_element $portal_id [my_name]]
# The default param "package_id" must be configured
set key "package_id"
@@ -121,7 +121,7 @@
} {
Removes a faq PE from the given page
- @param page_id The page to remove self from
+ @param portal_id The page to remove self from
@param package_id
@author arjun@openforce.net
@creation-date Sept 2001
@@ -138,29 +138,29 @@
}
ad_proc -public make_self_available {
- page_id
+ portal_id
} {
Wrapper for the portal:: proc
- @param page_id
+ @param portal_id
@author arjun@openforce.net
@creation-date Nov 2001
} {
portal::make_datasource_available \
- $page_id [portal::get_datasource_id [my_name]]
+ $portal_id [portal::get_datasource_id [my_name]]
}
ad_proc -public make_self_unavailable {
- page_id
+ portal_id
} {
Wrapper for the portal:: proc
- @param page_id
+ @param portal_id
@author arjun@openforce.net
@creation-date Nov 2001
} {
portal::make_datasource_unavailable \
- $page_id [portal::get_datasource_id [my_name]]
+ $portal_id [portal::get_datasource_id [my_name]]
}
}
Index: openacs-4/packages/fs-portlet/tcl/fs-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/tcl/fs-portlet-procs.tcl,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/fs-portlet/tcl/fs-portlet-procs.tcl 19 Nov 2001 15:15:52 -0000 1.15
+++ openacs-4/packages/fs-portlet/tcl/fs-portlet-procs.tcl 1 Dec 2001 23:18:53 -0000 1.16
@@ -31,22 +31,22 @@
}
ad_proc -public add_self_to_page {
- page_id
+ portal_id
community_id
folder_id
} {
Adds a fs PE to the given page with the community_id and
folder_id being opaque data in the portal configuration.
@return element_id The new element's id
- @param page_id The page to add self to
+ @param portal_id The page to add self to
@param community_id The community with the folder
@param folder_id The folder to show
@author arjun@openforce.net
@creation-date Sept 2001
} {
# Tell portal to add this element to the page
- set element_id [portal::add_element $page_id [my_name]]
+ set element_id [portal::add_element $portal_id [my_name]]
# The default param "community_id" must be configured
set key "community_id"
@@ -159,7 +159,7 @@
} {
Removes a fs PE from the given page
- @param page_id The page to remove self from
+ @param portal_id The page to remove self from
@param community_id
@author arjun@openforce.net
@creation-date Sept 2001
@@ -176,29 +176,29 @@
}
ad_proc -public make_self_available {
- page_id
+ portal_id
} {
Wrapper for the portal:: proc
- @param page_id
+ @param portal_id
@author arjun@openforce.net
@creation-date Nov 2001
} {
portal::make_datasource_available \
- $page_id [portal::get_datasource_id [my_name]]
+ $portal_id [portal::get_datasource_id [my_name]]
}
ad_proc -public make_self_unavailable {
- page_id
+ portal_id
} {
Wrapper for the portal:: proc
- @param page_id
+ @param portal_id
@author arjun@openforce.net
@creation-date Nov 2001
} {
portal::make_datasource_unavailable \
- $page_id [portal::get_datasource_id [my_name]]
+ $portal_id [portal::get_datasource_id [my_name]]
}
}
Index: openacs-4/packages/news-portlet/tcl/news-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/tcl/news-portlet-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/news-portlet/tcl/news-portlet-procs.tcl 19 Nov 2001 15:24:02 -0000 1.5
+++ openacs-4/packages/news-portlet/tcl/news-portlet-procs.tcl 1 Dec 2001 23:19:03 -0000 1.6
@@ -31,19 +31,19 @@
}
ad_proc -public add_self_to_page {
- page_id
+ portal_id
community_id
} {
Adds a news PE to the given page with the community_id.
@return element_id The new element's id
- @param page_id The page to add self to
+ @param portal_id The page to add self to
@param community_id The community with the folder
@author arjun@openforce.net
@creation-date Sept 2001
} {
# Tell portal to add this element to the page
- set element_id [portal::add_element $page_id [my_name]]
+ set element_id [portal::add_element $portal_id [my_name]]
# The default param "community_id" must be configured
set key "community_id"
@@ -125,7 +125,7 @@
} {
Removes a news PE from the given page
- @param page_id The page to remove self from
+ @param portal_id The page to remove self from
@param community_id
@author arjun@openforce.net
@creation-date Sept 2001
@@ -142,29 +142,29 @@
}
ad_proc -public make_self_available {
- page_id
+ portal_id
} {
Wrapper for the portal:: proc
- @param page_id
+ @param portal_id
@author arjun@openforce.net
@creation-date Nov 2001
} {
portal::make_datasource_available \
- $page_id [portal::get_datasource_id [my_name]]
+ $portal_id [portal::get_datasource_id [my_name]]
}
ad_proc -public make_self_unavailable {
- page_id
+ portal_id
} {
Wrapper for the portal:: proc
- @param page_id
+ @param portal_id
@author arjun@openforce.net
@creation-date Nov 2001
} {
portal::make_datasource_unavailable \
- $page_id [portal::get_datasource_id [my_name]]
+ $portal_id [portal::get_datasource_id [my_name]]
}
}