Index: openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/process-dependency-add-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit.tcl	3 Oct 2003 22:21:45 -0000	1.1
+++ openacs-4/contrib/packages/project-manager/www/process-dependency-add-edit.tcl	3 Oct 2003 23:13:15 -0000	1.2
@@ -11,13 +11,14 @@
     @return task_term_lower Terminology to use for Task
 
     @param dependency_id The new ID for dependencies we create
-    
+    @param use_dependency The tasks for whom we want to create dependencies
+
 } {
 
+    {use_dependency:integer,multiple ""}
     process_id:integer
     dependency_id:integer,optional
-    task_revisions:integer,multiple,optional
-    task_revisions_list:optional
+    process_task_id:integer,multiple,optional
     dependency_type:array,optional
     dependency_task_id:array,optional
     {project_item_id:integer ""}
@@ -33,6 +34,7 @@
 
 # --------------------------------------------------------------- #
 
+
 ns_log notice depedency page
 set mypage [ns_getform]
 if {[string equal "" $mypage]} {
@@ -43,20 +45,16 @@
 }
 
 
+
 # HACK because there isn't a facility for exporting multiple hidden
 # form variables in ad_form
-#if {[info exists task_revisions_list]} {
-    # convert task_revisions_list to task_revisions
-#    set task_revisions_list_tmp [lindex $task_revisions_list 0]
-#    set task_revisions [split $task_revisions_list " "]
-#}
 
-#if {[empty_string_p $project_item_id]} {
-    # get a parent project
-#    set project_item_id [db_string get_parent_project { }]
-#}
+set process_task_id_pass $process_task_id
+set process_task_id_pass [string map {"-" " "} $process_task_id_pass]
+set process_task_id      $process_task_id_pass
 
-if {![exists_and_not_null task_revisions]} {
+
+if {![exists_and_not_null use_dependency]} {
     ad_returnredirect "process-one?[export_url_vars process_id]"
 }
 
@@ -71,19 +69,25 @@
 # permissions
 
 set title "Add $task_term_lower dependencies"
-set context_bar [ad_context_bar [list "process-task-add-edit?[export_vars -url {{process_id process_task_id:multiple}}" "Assignments"] "New $task_term dependency"]
+set context_bar [ad_context_bar [list "process-task-add-edit?[export_vars -url {{process_id process_task_id:multiple}}]" "Assignments"] "New $task_term dependency"]
 
 permission::require_permission -party_id $user_id -object_id $package_id -privilege create
 
+set process_task_id_pass $process_task_id
+set process_task_id_pass [string map {" " "-"} $process_task_id]
 
 ad_form -name add_edit -form {
     dependency_id:key(pm_process_task_dependency_seq)
 
     {process_task_id:text(hidden)
-        {value $process_task_id}
+        {value $process_task_id_pass}
     }
 
+    {process_id:text(hidden)
+        {value $process_id}
+    }
 
+
 } -export {
     
 } -on_submit {
@@ -93,7 +97,7 @@
 
 } -new_data {
 
-    foreach tr $task_revisions {
+    foreach tr $use_dependency {
 
         set type_id $dependency_type($tr)
         set parent_tsk_id  $dependency_task_id($tr)
@@ -127,7 +131,7 @@
 
 db_foreach get_dependency_tasks { } -column_array dependency_tasks {
 
-    set dependency_options($dependency_tasks(task_title)) $dependency_tasks(item_id)
+    set dependency_options($dependency_tasks(task_title)) $dependency_tasks(task_id)
 
     lappend dependency_keys $dependency_tasks(task_title)
 }
@@ -139,9 +143,9 @@
 
 
 
-# get the information on tasks from their revision_numbers
+# get the information on tasks from their task_id numbers
 
-db_foreach get_task_info { } -column_array tasks {
+db_foreach dependency_query { } -column_array tasks {
 
     # set up the tasks that can be viewed. Takes out the current task
     set dependency_options_full ""
@@ -152,32 +156,27 @@
     }
 
     append add_edit_definition "
-        {item_id.$tasks(revision_id):text(hidden)
-            {value {$tasks(item_id)}}
+        {task_id.$tasks(task_id):text(hidden)
+            {value {$tasks(task_id)}}
         }
 
-        {task_title.$tasks(revision_id):text(inform)
+        {task_title.$tasks(task_id):text(inform)
             {label \"Subject\"}
             {value {$tasks(task_title)}}
         }
 
-        {description.$tasks(revision_id):text(inform)
+        {description.$tasks(task_id):text(inform)
             {label \"Description\"}
             {value {$tasks(description)}}
         }
 
-        {end_date.$tasks(revision_id):text(inform)
-            {label \"Deadline\"}
-            {value {$tasks(end_date)}}
-        }
-
-        {dependency_type.$tasks(revision_id):text(select)
+        {dependency_type.$tasks(task_id):text(select)
             {label \"Dependency type\"}
             {options {[join $options " "]}}
             {value {finish_before_start}}
         }
 
-        {dependency_task_id.$tasks(revision_id):text(select)
+        {dependency_task_id.$tasks(task_id):text(select)
             {label \"Dependency\"}
             {options {$dependency_options_full}}
             {help_text {$task_term the dependency is based on}}