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 -r1.55 -r1.56 --- openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl 9 May 2002 23:59:52 -0000 1.55 +++ openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl 10 May 2002 00:49:13 -0000 1.56 @@ -356,7 +356,7 @@ if {![empty_string_p $portal_id]} { fs_portlet::add_self_to_page \ -page_id $page_id \ - -extra_params [list style list contents_url "[get_url]all-contents"] \ + -extra_params [list scoped_p f contents_url "[get_url]all-contents"] \ $portal_id \ $package_id \ $user_root_folder_id Index: openacs-4/packages/fs-portlet/sql/oracle/fs-portlet-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/sql/oracle/fs-portlet-create.sql,v diff -u -r1.13 -r1.14 --- openacs-4/packages/fs-portlet/sql/oracle/fs-portlet-create.sql 9 May 2002 23:59:53 -0000 1.13 +++ openacs-4/packages/fs-portlet/sql/oracle/fs-portlet-create.sql 10 May 2002 00:49:13 -0000 1.14 @@ -26,13 +26,12 @@ ds_id portal_datasources.datasource_id%TYPE; foo integer; begin + ds_id := portal_datasource.new( name => 'fs_portlet', description => 'Displays the given folder_id' ); - -- the standard 4 params - -- shadeable_p portal_datasource.set_def_param( datasource_id => ds_id, config_required_p => 't', @@ -41,7 +40,6 @@ value => 't' ); - -- hideable_p portal_datasource.set_def_param( datasource_id => ds_id, config_required_p => 't', @@ -50,7 +48,6 @@ value => 't' ); - -- user_editable_p portal_datasource.set_def_param( datasource_id => ds_id, config_required_p => 't', @@ -59,7 +56,6 @@ value => 'f' ); - -- shaded_p portal_datasource.set_def_param( datasource_id => ds_id, config_required_p => 't', @@ -68,7 +64,6 @@ value => 'f' ); - -- link_hideable_p portal_datasource.set_def_param( datasource_id => ds_id, config_required_p => 't', @@ -81,11 +76,10 @@ datasource_id => ds_id, config_required_p => 't', configured_p => 'f', - key => 'style', - value => 'tree' + key => 'scoped_p', + value => 't' ); - -- fs-specific params portal_datasource.set_def_param( datasource_id => ds_id, config_required_p => 't', @@ -171,6 +165,7 @@ contract_name => 'portal_datasource', impl_name => 'fs_portlet' ); + end; / show errors Index: openacs-4/packages/fs-portlet/www/fs-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/fs-portlet/www/fs-portlet.tcl 30 Apr 2002 02:43:13 -0000 1.9 +++ openacs-4/packages/fs-portlet/www/fs-portlet.tcl 10 May 2002 00:49:13 -0000 1.10 @@ -39,7 +39,7 @@ set user_id [ad_conn user_id] set list_of_folder_ids $config(folder_id) set n_folders [llength $list_of_folder_ids] -set style $config(style) +set scoped_p [ad_decode $config(scoped_p) t 1 0] set user_root_folder [dotlrn_fs::get_user_root_folder -user_id $user_id] set user_root_folder_present_p 0 @@ -70,7 +70,7 @@ } set query "select_folder_contents" -if {![string equal $style "tree"]} { +if {!$scoped_p} { set query "select_folders" }