Index: openacs-4/packages/datamanager/www/available-comm-template.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/datamanager/www/available-comm-template.adp,v diff -u -N -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/datamanager/www/available-comm-template.adp 9 Nov 2005 19:42:40 -0000 1.1.2.1 +++ openacs-4/packages/datamanager/www/available-comm-template.adp 10 Nov 2005 12:10:43 -0000 1.1.2.2 @@ -1,4 +1,4 @@ - + Index: openacs-4/packages/datamanager/www/available-comm-template.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/datamanager/www/available-comm-template.tcl,v diff -u -N -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/datamanager/www/available-comm-template.tcl 9 Nov 2005 19:42:40 -0000 1.1.2.1 +++ openacs-4/packages/datamanager/www/available-comm-template.tcl 10 Nov 2005 12:10:43 -0000 1.1.2.2 @@ -11,9 +11,21 @@ if {[info exist department_key] eq 0} { set department_key "" } - set available_communities [datamanager::get_available_communities \ - -object_type $object_type \ - -action_type $action_type \ - -communities_classes $communities_classes \ - -department_key $department_key] + set available_name [join [list "available" $communities_classes] "_"] +if { $action_type eq "move"} { + set $available_name [datamanager::get_available_communities \ + -object_type $object_type \ + -action_type $action_type \ + -communities_classes $communities_classes \ + -department_key $department_key] +} elseif {$action_type eq "copy"} { + set $available_name [datamanager::get_available_communities \ + -object_type $object_type \ + -action_type $action_type \ + -mode_list $mode_list \ + -bulk_action_export_vars [list [list object_id $object_id] [list mode $mode] ] \ + -communities_classes $communities_classes \ + -department_key $department_key] +} + 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 -N -r1.1.2.5 -r1.1.2.6 --- openacs-4/packages/datamanager/www/one-object-copy.adp 9 Nov 2005 19:42:40 -0000 1.1.2.5 +++ openacs-4/packages/datamanager/www/one-object-copy.adp 10 Nov 2005 12:10:43 -0000 1.1.2.6 @@ -5,17 +5,11 @@

Copy objects

@object_name@

#datamanager.to#

+ + - -

#datamanager.Sorry# - - + - - Current copy mode is @mode@ - + + - - - - 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 -N -r1.1.2.6 -r1.1.2.7 --- openacs-4/packages/datamanager/www/one-object-copy.tcl 2 Nov 2005 17:02:19 -0000 1.1.2.6 +++ openacs-4/packages/datamanager/www/one-object-copy.tcl 10 Nov 2005 12:10:43 -0000 1.1.2.7 @@ -5,6 +5,7 @@ } -query { object_id:multiple,notnull + {department_key: "all"} {mode: ""} } -properties { } @@ -73,8 +74,22 @@ set mode_list {} } -set available_communities [datamanager::get_available_communities\ - -object_type $object_type\ - -action_type $action\ - -mode_list $mode_list\ - -bulk_action_export_vars [list [list object_id $object_id] [list mode $mode] ] ] +set departments_temp [db_list_of_lists get_departments_list {}] +set departments [linsert $departments_temp 0 [list All all]] + +form create department_form -has_submit 1 + +element create department_form department_key \ + -label "Departments" \ + -datatype text \ + -widget select \ + -options $departments \ + -optional \ + -html {onChange document.department_form.submit()} \ + -value $department_key + +element create department_form object_id \ + -datatype text \ + -widget hidden \ + -value $object_id + Index: openacs-4/packages/datamanager/www/one-object-copy.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/datamanager/www/one-object-copy.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/datamanager/www/one-object-copy.xql 10 Nov 2005 12:10:43 -0000 1.1.2.1 @@ -0,0 +1,13 @@ + + + + + + SELECT dct.pretty_name, dd.department_key + FROM dotlrn_departments dd, dotlrn_community_types dct + WHERE dct.community_type=dd.department_key + + + + + 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 -N -r1.1.2.7 -r1.1.2.8 --- openacs-4/packages/datamanager/www/one-object-move.tcl 9 Nov 2005 19:42:40 -0000 1.1.2.7 +++ openacs-4/packages/datamanager/www/one-object-move.tcl 10 Nov 2005 12:10:43 -0000 1.1.2.8 @@ -48,7 +48,7 @@ foreach object $ancestors_ids { set object_type [datamanager::get_object_type -object_id $object] - ns_log Notice $object_type + set object_data_temp [datamanager::get_object_data -object_type $object_type -object_id $object] lappend object_data $object_data_temp lappend object_name [lindex $object_data_temp 0] @@ -61,14 +61,10 @@ set action "move" set departments_temp [db_list_of_lists get_departments_list {}] -ns_log Notice "departments_antes: $departments_temp" + set departments [linsert $departments_temp 0 [list All all]] # -#foreach dpt_item $departments_temp { -# set departments [lappend $departments $dpt_item] -# ns_log Notice "departments_despues: $departments" -#} -ns_log Notice "departments_despues: $departments" + form create department_form -has_submit 1 element create department_form department_key \ Index: openacs-4/packages/datamanager/www/use-dotlrn_fs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/datamanager/www/use-dotlrn_fs.tcl,v diff -u -N -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/datamanager/www/use-dotlrn_fs.tcl 2 Nov 2005 17:02:19 -0000 1.1.2.2 +++ openacs-4/packages/datamanager/www/use-dotlrn_fs.tcl 10 Nov 2005 12:10:43 -0000 1.1.2.3 @@ -11,7 +11,7 @@ } -properties { } - +ns_log Notice "dest_community: $dest_community_id" set selected_community $dest_community_id dotlrn::require_user_admin_community -community_id [dotlrn_community::get_community_id] set context [list []]