Index: openacs-4/packages/logger/lib/entries.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/lib/entries.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/logger/lib/entries.tcl	10 May 2006 18:53:01 -0000	1.20
+++ openacs-4/packages/logger/lib/entries.tcl	13 Jun 2006 04:35:04 -0000	1.21
@@ -272,7 +272,7 @@
         where_clause {
             le.project_id = :project_id
         }
-        add_url_eval {[export_vars -base "${base_url}log" { { project_id $__filter_value } variable_id }]}
+        add_url_eval {[export_vars -base "${base_url}log" { { project_id $__filter_value } pm_task_id variable_id }]}
         has_default_p {[ad_decode [llength $project_values] 1 1 0]}
     }
     project_status {
@@ -288,7 +288,7 @@
         where_clause {
             le.variable_id = :variable_id
         }
-        add_url_eval {[ad_decode [exists_and_not_null project_id] 1 [export_vars -base "${base_url}log" { project_id { variable_id $__filter_value } }] ""]}
+        add_url_eval {[ad_decode [exists_and_not_null project_id] 1 [export_vars -base "${base_url}log" { project_id pm_task_id { variable_id $__filter_value } }] ""]}
         has_default_p t
     }
     projection_id {
@@ -629,7 +629,7 @@
         continue
     } else {
         set selected_p [string equal [ns_queryget entry_id] $entry_id]
-        set edit_url [export_vars -base "${base_url}log" { entry_id { edit t } { return_url [ad_return_url] } }]
+        set edit_url [export_vars -base "${base_url}log" { entry_id { edit t } pm_project_id pm_task_id { return_url [ad_return_url] } }]
         if { ![exists_and_not_null project_write_p($project_id)] } {
             set project_write_p($project_id) [template::util::is_true [permission::permission_p -object_id $project_id -privilege write]]
         }
Index: openacs-4/packages/logger/www/log.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/log.tcl,v
diff -u -r1.37 -r1.38
--- openacs-4/packages/logger/www/log.tcl	8 Jan 2006 11:13:34 -0000	1.37
+++ openacs-4/packages/logger/www/log.tcl	13 Jun 2006 04:35:04 -0000	1.38
@@ -84,7 +84,11 @@
 logger::project::get -project_id $project_id -array project_array
 logger::variable::get -variable_id $variable_id -array variable_array
 set unit "[_ [regsub -all {#} $variable_array(unit) ""]]"
+set project_array(name) [lang::util::localize $project_array(name)]
 
+
+##### Integration with project manager. Should be callback in the long run.
+
 # get the project_manager_url if this is related to project manager
 set project_manager_url [logger::util::project_manager_url]
 
@@ -118,6 +122,8 @@
 
     }
 
+    set task_options [lang::util::localize $task_options]
+
 }
 
 ###########
@@ -166,7 +172,7 @@
 }
 lappend actions { Done done }
 
-ad_form -name log_entry_form -cancel_url $return_url -mode $ad_form_mode \
+ad_form -name log_entry_form -mode $ad_form_mode \
     -actions $actions -form {
     entry_id:key(acs_object_id_seq)
 }
@@ -181,6 +187,9 @@
         {label "[_ logger.Project]"}
         {value $project_array(name)}
     }
+    {status_description:text(inform)
+	{label "[_ project-manager.Status]"}
+    }
 }
 
 if { [exists_and_not_null entry_id] && [logger::util::project_manager_linked_p] && [info exists entry_array]} {
@@ -284,9 +293,6 @@
             {help}
             {help_text "[_ logger.lt_If_you_change_this_pl]"}
         }
-        {status_description:text(inform)
-            {label "[_ project-manager.Status]"}
-        }
     } 
 
     if {[exists_and_not_null pm_task_id]} {
@@ -358,7 +364,7 @@
 #
 ###########
 
-ad_form -extend -name log_entry_form -select_query_name select_logger_entries -validate {
+ad_form -extend -name log_entry_form -validate {
     {value 
         { [regexp {^-?([0-9]{1,6}|[0-9]{0,6}\.[0-9]{0,2})$} $value] }
         {The value may not contain more than two decimals and must be between -999999.99 and 999999.99}
@@ -374,14 +380,19 @@
 	set description $default_description
     }
 
+} -edit_request {
+    db_1row select_logger_entries {}
+    set time_stamp [template::util::date::from_ansi $time_stamp [lc_get frombuilder_time_format]]
+    set status_description [lang::util::localize [pm::project::get_status_description -project_item_id $pm_project_id]]
+
 } -new_request {
     # Get the date of the last entry
     set time_stamp [ad_get_client_property logger time_stamp]
     if { [empty_string_p $time_stamp] } {
         set time_stamp [clock format [clock seconds] -format "%Y-%m-%d"]
     }
     set time_stamp [template::util::date::acquire ansi $time_stamp]
-    set status_description [lang::util::localize $status_description]
+    set status_description [lang::util::localize [pm::project::get_status_description -project_item_id $pm_project_id]]
 } -new_data {
     
     # jarkko: check to see if user has already added this entry and has come
@@ -521,7 +532,7 @@
     }
 
     if {[logger::util::project_manager_linked_p]} {
-        set this_task_id [db_string task_entry_p "select task_item_id from pm_task_logger_proj_map where logger_entry = :entry_id" -default "-1"]
+	set this_task_id [lindex [application_data_link::get_linked_content -from_object_id $entry_id -to_content_type pm_task] 0]
     } else {
         set this_task_id -1
     }