Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -N -r1.55 -r1.56
--- openacs-4/packages/acs-subsite/acs-subsite.info 8 Oct 2003 16:05:24 -0000 1.55
+++ openacs-4/packages/acs-subsite/acs-subsite.info 10 Oct 2003 09:02:18 -0000 1.56
@@ -7,14 +7,14 @@
t
f
-
+
OpenACS
Provides the ability to create subsite within the OpenACS Community System.
- 2003-09-12
+ 2003-10-10
OpenACS
Aware of parties, groups, users, portraits, ...
-
+
@@ -46,6 +46,8 @@
+
+
Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 2 Oct 2003 22:15:49 -0000 1.13
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 10 Oct 2003 09:02:18 -0000 1.14
@@ -539,10 +539,18 @@
}
}
- lappend pageflow members {
- label "Members"
- folder "members"
- selected_patterns {*}
+ set user_id [ad_conn user_id]
+ set group_id [application_group::group_id_from_package_id]
+ set admin_p [ad_permission_p -user_id $user_id $group_id "admin"]
+ set show_member_list_to [parameter::get -parameter "ShowMembersListTo" -default 2]
+
+ if { $admin_p || ($user_id != 0 && $show_member_list_to == 1) || \
+ $show_member_list_to == 0 } {
+ lappend pageflow members {
+ label "Members"
+ folder "members"
+ selected_patterns {*}
+ }
}
Index: openacs-4/packages/acs-subsite/www/group-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-master.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/group-master.tcl 22 Sep 2003 09:17:44 -0000 1.5
+++ openacs-4/packages/acs-subsite/www/group-master.tcl 10 Oct 2003 09:02:18 -0000 1.6
@@ -23,7 +23,7 @@
set subsite_name $subsite_sitenode(instance_name)
# Where to find the stylesheet
-set css_url "/resoources/acs-subsite/group-master.css"
+set css_url "/resources/acs-subsite/group-master.css"
# Context bar
if { [template::util::is_nil no_context_p] } {
Index: openacs-4/packages/acs-subsite/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.adp,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-subsite/www/index.adp 3 Oct 2003 10:14:31 -0000 1.13
+++ openacs-4/packages/acs-subsite/www/index.adp 10 Oct 2003 09:02:18 -0000 1.14
@@ -35,11 +35,13 @@
+
- |
+ |
» Members
|
+
Index: openacs-4/packages/acs-subsite/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-subsite/www/index.tcl 2 Oct 2003 22:04:46 -0000 1.13
+++ openacs-4/packages/acs-subsite/www/index.tcl 10 Oct 2003 09:02:18 -0000 1.14
@@ -15,6 +15,7 @@
nodes:multirow
admin_p:onevalue
user_id:onevalue
+ show_members_page_link_p:onevalue
}
set main_site_p [string equal [ad_conn package_url] "/"]
@@ -39,6 +40,10 @@
set subsite_url [subsite::get_element -element url]
+set show_members_list_to [parameter::get -parameter "ShowMembersListTo" -default 2]
+set show_members_page_link_p \
+ [expr $admin_p || ($user_id != 0 && $show_members_list_to ==1) || \
+ $show_members_list_to == 0 ]
# User's group membership
Index: openacs-4/packages/acs-subsite/www/members/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/index.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/members/index.adp 28 Aug 2003 09:41:41 -0000 1.2
+++ openacs-4/packages/acs-subsite/www/members/index.adp 10 Oct 2003 09:02:18 -0000 1.3
@@ -2,4 +2,10 @@
@context@
@page_title@
+
+
+
+@title@
+Sorry, but you are not allowed to view the members list.
+
Index: openacs-4/packages/acs-subsite/www/members/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/index.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/members/index.tcl 3 Oct 2003 09:07:09 -0000 1.4
+++ openacs-4/packages/acs-subsite/www/members/index.tcl 10 Oct 2003 09:02:18 -0000 1.5
@@ -23,9 +23,13 @@
# - does user have delete on group?
set admin_p [ad_permission_p -user_id $user_id $group_id "admin"]
-if { !$admin_p && ![parameter::get -parameter "MembersCanSeeMembersP" -default 1] } {
- ad_return_forbidden "Cannot see the members list" "I'm sorry, but you're not allowed to view the members list"
- ad_script_abort
+set show_member_list_to [parameter::get -parameter "ShowMembersListTo" -default 2]
+if { $admin_p || ($user_id != 0 && $show_member_list_to == 1) || \
+ $show_member_list_to == 0} {
+ set show_members_list_p 1
+} else {
+ set show_members_list_p 0
+ set title "Cannot see the members list"
}
if { $admin_p } {