Index: openacs-4/packages/logger/tcl/project-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/project-procs.tcl,v
diff -u -r1.6 -r1.6.4.1
--- openacs-4/packages/logger/tcl/project-procs.tcl	1 May 2003 14:14:33 -0000	1.6
+++ openacs-4/packages/logger/tcl/project-procs.tcl	7 Jul 2003 14:53:20 -0000	1.6.4.1
@@ -100,6 +100,24 @@
     db_dml update_project {}
 }
 
+ad_proc -public logger::project::set_active_p {
+    {-project_id:required}
+    {-active_p:required}
+} {
+    Set a Logger project active/inactive.
+
+    @param project_id The id of the project to edit
+    @param active_p The new value for active_p, must be t (true) or f (false)
+
+    @return The return value from db_dml
+
+    @author Lars Pind (lars@collaboraid.biz)
+} {
+    ad_assert_arg_value_in_list active_p {t f}
+
+    db_dml update_project {}
+}
+
 ad_proc -public logger::project::delete {
     {-project_id:required}
 } {
@@ -258,4 +276,16 @@
     @author Peter Marklund
 } {
     return [db_string select_primary_variable {} -default ""]
-}
\ No newline at end of file
+}
+
+ad_proc -private logger::project::users_get_options {} {
+    Get the list of users to display in a drop-down to pick project lead.
+} {
+    set package_id [ad_conn package_id]
+
+    set users_list [db_list_of_lists select_project_leads {}]
+
+    lappend users_list { "Search..." ":search:"}
+    
+    return $users_list
+}
Index: openacs-4/packages/logger/tcl/project-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/project-procs.xql,v
diff -u -r1.5 -r1.5.4.1
--- openacs-4/packages/logger/tcl/project-procs.xql	1 May 2003 14:14:33 -0000	1.5
+++ openacs-4/packages/logger/tcl/project-procs.xql	7 Jul 2003 14:53:20 -0000	1.5.4.1
@@ -83,4 +83,23 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="logger::project::set_active_p.update_project">
+    <querytext>
+        update logger_projects
+        set    active_p = :active_p
+        where  project_id = :project_id
+    </querytext>
+  </fullquery>
+
+
+  <fullquery name="logger::project::users_get_options.select_project_leads">
+    <querytext>
+        select acs_object__name(p.project_lead), project_lead
+        from   logger_projects p,
+               logger_project_pkg_map ppm
+        where  ppm.project_id = p.project_id
+        and    ppm.package_id = :package_id
+    </querytext>
+  </fullquery>
+
 </queryset>
Index: openacs-4/packages/logger/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/index.adp,v
diff -u -r1.8 -r1.8.4.1
--- openacs-4/packages/logger/www/admin/index.adp	8 May 2003 13:56:04 -0000	1.8
+++ openacs-4/packages/logger/www/admin/index.adp	7 Jul 2003 14:53:20 -0000	1.8.4.1
@@ -33,7 +33,7 @@
         <td class="logger_listing">
           <a href="@projects.display_url@" title="Display project info">@projects.name@</a>
         </td>
-        <td class="logger_listing"><if @projects.active_p@ eq t>Yes</if><else>No</else> </td>
+        <td class="logger_listing"><if @projects.active_p@ eq t>Yes (<a href="@projects.make_inactive_url@" title="Make this project inactive">toggle</a>)</if><else>No (<a href="@projects.make_active_url@" title="Make this project active">toggle</a>)</else> </td>
         <td class="logger_listing">@projects.project_lead_chunk@</td>
         <td class="logger_listing_narrow" align="center">
           <if @projects.admin_p@>
Index: openacs-4/packages/logger/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/index.tcl,v
diff -u -r1.6 -r1.6.4.1
--- openacs-4/packages/logger/www/admin/index.tcl	8 May 2003 13:56:04 -0000	1.6
+++ openacs-4/packages/logger/www/admin/index.tcl	7 Jul 2003 14:53:20 -0000	1.6.4.1
@@ -21,14 +21,19 @@
 #
 ###########
 
-db_multirow -extend { edit_url display_url permissions_url delete_url unmap_url project_lead_chunk } projects select_projects {} {
+db_multirow -extend { 
+    edit_url display_url permissions_url delete_url unmap_url project_lead_chunk
+    make_active_url make_inactive_url
+} projects select_projects {} {
     set description [string_truncate -len 50 $description]
 
     set edit_url "project?[export_vars { project_id {formbutton\:formbuilder\:\:edit Edit} {form\:id project_form} {form\:mode display}}]"
     set display_url "project?[export_vars { project_id }]"
     set unmap_url "project-instance-map?[export_vars { project_id {unmap "t"} }]"
     set permissions_url "${permissions_uri}?[export_vars {{object_id $project_id} application_url}]"
     set delete_url "project-delete?[export_vars { project_id }]"
+    set make_active_url "project-make-active?[export_vars { project_id }]"
+    set make_inactive_url "project-make-inactive?[export_vars { project_id }]"
     set project_lead_chunk [ad_present_user $project_lead_id $project_lead_name]
 }
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/logger/www/admin/project-make-active.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/logger/www/admin/project-make-inactive.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/logger/www/admin/project.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/project.tcl,v
diff -u -r1.9 -r1.9.4.1
--- openacs-4/packages/logger/www/admin/project.tcl	8 May 2003 13:56:04 -0000	1.9
+++ openacs-4/packages/logger/www/admin/project.tcl	7 Jul 2003 14:53:20 -0000	1.9.4.1
@@ -57,11 +57,31 @@
 	{html {cols 60 rows 13}} 
         {label "Description"}
     }
-} -select_query {
-            select name,
-               description
-        from logger_projects
-       where project_id = :project_id
+
+    {project_lead:search
+        {result_datatype integer}
+        {label {Project Lead}}
+        {options [logger::project::users_get_options]}
+        {search_query {[db_map dbqd.acs-tcl.tcl.community-core-procs.user_search]}}
+    }
+}
+
+if { ![ad_form_new_p -key project_id] } {
+    ad_form -extend -name project_form -form {
+        {active_p:text(radio)
+            {label "Active"}
+            {options {{Yes t} {No f}}}
+        }
+    }
+}
+
+ad_form -extend -name project_form -select_query {
+    select name,
+           description,
+           project_lead,
+           active_p
+    from   logger_projects
+    where  project_id = :project_id
 } -validate {
     {
         name
@@ -71,19 +91,24 @@
 
 } -new_data {
 
-    logger::project::new -project_id $project_id \
-                         -name $name \
-                         -description $description \
+    logger::project::new \
+        -project_id $project_id \
+        -name $name \
+        -description $description \
+        -project_lead $project_lead
+
 } -edit_data {
 
     # The edit proc requires all attributes to be provided
     # so use the old values for project_lead and active_p
-    logger::project::get -project_id $project_id -array old_project
-    logger::project::edit -project_id $project_id \
-                          -name $name \
-                          -description $description \
-                          -project_lead $old_project(project_lead) \
-                          -active_p $old_project(active_p)
+
+    logger::project::edit \
+        -project_id $project_id \
+        -name $name \
+        -description $description \
+        -project_lead $project_lead \
+        -active_p $active_p
+
 } -after_submit {
       
     ad_returnredirect "[ad_conn url]?project_id=$project_id"