Index: openacs-4/packages/datamanager/tcl/datamanager-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/datamanager/tcl/datamanager-procs.tcl,v diff -u -r1.1.2.4 -r1.1.2.5 --- openacs-4/packages/datamanager/tcl/datamanager-procs.tcl 10 Oct 2005 12:59:34 -0000 1.1.2.4 +++ openacs-4/packages/datamanager/tcl/datamanager-procs.tcl 19 Oct 2005 08:14:27 -0000 1.1.2.5 @@ -82,35 +82,66 @@ ad_proc -public get_available_communities { -object_type:required + {-action_type "move"} } { Get the list of communities, subgroups or classes where an object can be moved } { + + +if {$action_type eq "move"} { + set bulk_actions {} + set elements { + selected { + label {[_ datamanager.Selected]} + display_template { + + } + } + community_id { + hide_p 1 + } + + community_type { + label {[_ datamanager.Type]} + display_col type + } + community_name { + label {[_ datamanager.Name]} + display_col name + } + } +} else { + set bulk_actions {Copy do-it {Copy cheched objects}} + set elements { + community_id { + hide_p 1 + } + + community_type { + label {[_ datamanager.Type]} + display_col type + } + community_name { + label {[_ datamanager.Name]} + display_col name + } + } +} + + + + + + + #create the template_list template::list::create \ -name available_communities \ -multirow communities \ -key community_id \ - -elements { - selected { - label {[_ datamanager.Selected]} - display_template { - - } - } - community_id { - hide_p 1 - } - - community_type { - label {[_ datamanager.Type]} - display_col type - } - community_name { - label {[_ datamanager.Name]} - display_col name - } - } + -bulk_actions $bulk_actions \ + -elements $elements set comm_id [dotlrn_community::get_community_id] Index: openacs-4/packages/datamanager/www/index-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/datamanager/www/Attic/index-postgresql.xql,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/datamanager/www/index-postgresql.xql 20 Jul 2005 13:49:46 -0000 1.1.2.1 +++ openacs-4/packages/datamanager/www/index-postgresql.xql 19 Oct 2005 08:16:01 -0000 1.1.2.2 @@ -65,9 +65,8 @@ tree_right(ci2.tree_sortkey) and ci2.item_id=:root_folder_id and ci1.item_id=cf.folder_id - and ao.object_id=cf.folder_id - - + and ao.object_id=cf.folder_id + Index: openacs-4/packages/datamanager/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/datamanager/www/index.adp,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/datamanager/www/index.adp 20 Jul 2005 13:49:46 -0000 1.1.2.1 +++ openacs-4/packages/datamanager/www/index.adp 19 Oct 2005 08:16:01 -0000 1.1.2.2 @@ -3,6 +3,15 @@ #datamanager.pretty_name# @context;noquote@ - +

Select object type:

+ +


Index: openacs-4/packages/datamanager/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/datamanager/www/index.tcl,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/datamanager/www/index.tcl 10 Oct 2005 12:59:34 -0000 1.1.2.2 +++ openacs-4/packages/datamanager/www/index.tcl 19 Oct 2005 08:16:01 -0000 1.1.2.3 @@ -1,5 +1,5 @@ ad_page_contract { - Show the list of communities where an object can be moved + Show the list of datamanager supported objects @author Luis de la Fuente(lfuente@it.uc3m.es) @creation_date 2005-07-05 @@ -16,49 +16,46 @@ # prevent this page from being called when not in a community # (i.e. the main dotlrn instance -if {[empty_string_p $community_id]]} { +if {[empty_string_p $community_id]} { ad_returnredirect "[dotlrn::get_url]" } db_1row datamanager::select_folder_package_id {} -set prueba_id [dotlrn_community::get_applet_package_id -community_id $community_id -applet_key 'dotlrn_fs'] - -nslog Notice "$package_id $prueba_id" - - set root_folder_id [fs::get_root_folder -package_id $package_id] -template::list::create \ - -name objects \ - -multirow objects \ - -elements { - name { - label {[_ datamanager.Name]]} - } - object_type { - label {[_ datamanager.Type]} - } - move { - display_template {[_ datamanager.Move]} - link_url_col move_object_url - } - copy { - display_template {[_ datamanager.Copy]} - link_url_col copy_object_url - } - delete { - display_template {[_ datamanager.Delete]} - link_url_col delete_object_url - } +set supported_types_list {Assessments Faqs Forums Folders News Static-Portlet} +set next_url select-objects - } - -db_multirow -extend { move_object_url - copy_object_url - delete_object_url -} objects datamanager::select_objects { -} { - set move_object_url [export_vars -base one-object-move { object_id }] - set copy_object_url [export_vars -base one-object-copy { object_id }] - set delete_object_url [export_vars -base one-object-delete { object_id }] -} +#template::list::create \ +# -name objects \ +# -multirow objects \ +# -elements { +# name { +# label {[_ datamanager.Name]]} +# } +# object_type { +# label {[_ datamanager.Type]} +# } +# move { +# display_template {[_ datamanager.Move]} +# link_url_col move_object_url +# } +# copy { +# display_template {[_ datamanager.Copy]} +# link_url_col copy_object_url +# } +# delete { +# display_template {[_ datamanager.Delete]} +# link_url_col delete_object_url +# } +# +# } +#db_multirow -extend { move_object_url +# copy_object_url +# delete_object_url +#} objects datamanager::select_objects { +#} { +# set move_object_url [export_vars -base one-object-move { object_id }] +# set copy_object_url [export_vars -base one-object-copy { object_id }] +# set delete_object_url [export_vars -base one-object-delete { object_id }] +#} Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/datamanager/www/manage-object1.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/datamanager/www/manage-object1.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/datamanager/www/manage-object1.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/datamanager/www/one-object-copy.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/datamanager/www/one-object-copy.adp,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/datamanager/www/one-object-copy.adp 23 Sep 2005 14:15:38 -0000 1.1.2.2 +++ openacs-4/packages/datamanager/www/one-object-copy.adp 19 Oct 2005 08:16:01 -0000 1.1.2.3 @@ -6,16 +6,11 @@

Copy @object_name@ to

-
- -

#datamanager.Sorry# -

- - + Index: openacs-4/packages/datamanager/www/one-object-copy.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/datamanager/www/one-object-copy.tcl,v diff -u -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/datamanager/www/one-object-copy.tcl 10 Oct 2005 12:59:34 -0000 1.1.2.3 +++ openacs-4/packages/datamanager/www/one-object-copy.tcl 19 Oct 2005 08:16:01 -0000 1.1.2.4 @@ -24,5 +24,5 @@ set action "copy" -set available_communities [datamanager::get_available_communities -object_type $object_type] +set available_communities [datamanager::get_available_communities -object_type $object_type -action_type $action] Index: openacs-4/packages/datamanager/www/one-object-move.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/datamanager/www/Attic/one-object-move.tcl,v diff -u -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/datamanager/www/one-object-move.tcl 10 Oct 2005 12:59:34 -0000 1.1.2.3 +++ openacs-4/packages/datamanager/www/one-object-move.tcl 19 Oct 2005 08:16:01 -0000 1.1.2.4 @@ -24,5 +24,5 @@ set action "move" -set available_communities [datamanager::get_available_communities -object_type $object_type] +set available_communities [datamanager::get_available_communities -object_type $object_type -action_type $action] Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/datamanager/www/select-objects.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/datamanager/www/select-objects.tcl'. Fisheye: No comparison available. Pass `N' to diff?