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.1 -r1.1.2.2
--- openacs-4/packages/datamanager/www/one-object-copy.adp	20 Jul 2005 13:49:46 -0000	1.1.2.1
+++ openacs-4/packages/datamanager/www/one-object-copy.adp	23 Sep 2005 14:15:38 -0000	1.1.2.2
@@ -4,4 +4,18 @@
 <property name="context">@context;noquote@</property>
 <br>
 
+<p>Copy <b>@object_name@</b> to</p>
 
+<form name="input" action="@object_url@" method="get">
+<input type="hidden" name="action" value="@action@">
+<input type="hidden" name="object_id" value="@object_id@">
+<if @communities:rowcount@ eq 0>
+    <p>#datamanager.Sorry#
+</if>
+<else>
+<listtemplate name="available_communities"></listtemplate>
+<p></p>
+<input type="submit" value="Copy">
+</else>
+
+</form>
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.1 -r1.1.2.2
--- openacs-4/packages/datamanager/www/one-object-copy.tcl	20 Jul 2005 13:49:46 -0000	1.1.2.1
+++ openacs-4/packages/datamanager/www/one-object-copy.tcl	23 Sep 2005 14:15:38 -0000	1.1.2.2
@@ -4,8 +4,22 @@
     @creation_date 2005-07-05
     
 } -query {
+    object_id:integer,notnull
 } -properties {
 }
 
 
 set context [list [_ datamanager.Object_Copy]]
+set title "[_ datamanager.Choose_Destination]"    
+
+set object_type [datamanager::get_object_type -object_id $object_id]
+set object_data [datamanager::get_object_data -object_type $object_type -object_id $object_id]
+
+set object_name [lindex $object_data 0]
+set object_url [lindex $object_data 1]
+set object_type [lindex $object_data 2]
+
+set action "copy"
+
+set available_communities [datamanager::get_available_communities -object_type $object_type]
+
Index: openacs-4/packages/datamanager/www/one-object-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/datamanager/www/Attic/one-object-move.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/datamanager/www/one-object-move.adp	20 Jul 2005 13:49:46 -0000	1.1.2.1
+++ openacs-4/packages/datamanager/www/one-object-move.adp	23 Sep 2005 14:15:38 -0000	1.1.2.2
@@ -6,8 +6,10 @@
 
 <p> #datamanager.Move_1# <b>@object_name@</b> #datamanager.to#</p>
 
-<form name="input" action="@move_object_url@" method="get">
+<form name="input" action="@object_url@" method="get">
 <input type="hidden" name="object_id" value="@object_id@">
+<input type="hidden" name="action" value="@action@">
+
 <if @communities:rowcount@ eq 0>
     <p>#datamanager.Sorry#
 </if>
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.1 -r1.1.2.2
--- openacs-4/packages/datamanager/www/one-object-move.tcl	20 Jul 2005 13:49:46 -0000	1.1.2.1
+++ openacs-4/packages/datamanager/www/one-object-move.tcl	23 Sep 2005 14:15:38 -0000	1.1.2.2
@@ -11,90 +11,15 @@
 set context [list [_ datamanager.Object_Move]]
 set title "[_ datamanager.Choose_Destination]"    
 
-#get object type
-db_1row datamanager::get_object_type {}
+set object_type [datamanager::get_object_type -object_id $object_id]
+set object_data [datamanager::get_object_data -object_type $object_type -object_id $object_id]
 
+set object_name [lindex $object_data 0]
+set object_url [lindex $object_data 1]
+set object_type [lindex $object_data 2]
 
+set action "move"
 
-switch $object_type {
-    "faq" {
-        #get faq data
-        db_1row datamanager::get_data_faq {}
-        set move_object_url move-faq
-        set object_type dotlrn_faq
-    }
-    "forums_forum" {
-        db_1row datamanager::get_data_forum {}
-        set move_object_url move-forum
-        set object_type dotlrn_forums  
-    }
-    "news" {
-        #
-        db_1row datamanager::get_data_news {}
-        set move_object_url move-news
-        set object_type dotlrn_news  
-    }
-    "static_portal_content" {
-        #
-        db_1row datamanager::get_data_static_portal {}
-        set move_object_url move-static-portlet
-        set object_type dotlrn_static
-    }
-    "as_assessments" {
-        #
-        db_1row datamanager::get_data_assessment {}
-        set move_object_url move-assessment
-        set object_type dotlrn_assessment
-    }
-    "content_folder" {
-        #
-        db_1row datamanager::get_data_folder {}
-        set move_object_url move-folder
-        set object_type dotlrn_fs
-    }
 
-    default {
-        set object_name "[_ datamanager._Not]"
-    }
-}
+set available_communities [datamanager::get_available_communities -object_type $object_type]
 
-
-
-template::list::create \
-    -name available_communities \
-    -multirow communities \
-    -key community_id \
-    -elements {
-    selected {
-        label {[_ datamanager.Selected]}
-	    display_template {
-	    <input name="selected_community" value="@communities.community_id@" type="radio">
-	    }
-	}
-	community_id {
-	    hide_p 1
-	}
-	
-	community_type {
-	    label {[_ datamanager.Type]}
-	    display_col type
-	}
-	community_name {
-	    label {[_ datamanager.Name]}
-	    display_col name
-	}
-    }
-              
-    set comm_id [dotlrn_community::get_community_id]
-    
-    db_multirow -extend { type } communities datamanager::get_data_communities {} {
-    if {$community_type == "dotlrn_club"} {
-        set type "[_ datamanager.Community]"
-    } elseif {$community_type == "dotlrn_community"} {
-        db_1row datamanager::get_parent_community_id {}
-        set type "[_ datamanager.Subgroup_of]"
-    	append type $pretty_name
-    } else  {         
-        set type "[_ datamanager.Class]"
-    }
-}