Index: openacs-4/contrib/packages/project-manager/www/add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/add-edit.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/www/add-edit.tcl	30 Jul 2003 20:42:05 -0000	1.3
+++ openacs-4/contrib/packages/project-manager/www/add-edit.tcl	31 Jul 2003 20:11:41 -0000	1.4
@@ -27,16 +27,23 @@
 
 }
 
-set user_id [ad_maybe_redirect_for_registration]
-
+# --------------------------------------------------------------- #
+# the unique identifier for this package
 set package_id [ad_conn package_id]
+set user_id    [ad_maybe_redirect_for_registration]
 
 if {[exists_and_not_null project_id]} {
     set title "Edit a project"
     set context_bar [ad_context_bar "Edit Project"]
+
+    # permissions
+    permission::require_permission -party_id $user_id -object_id $package_id -privilege write
 } else {
     set title "Add a project"
     set context_bar [ad_context_bar "New Project"]
+
+    # permissions
+    permission::require_permission -party_id $user_id -object_id $package_id -privilege create
 }
 
 
Index: openacs-4/contrib/packages/project-manager/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/www/index.adp	30 Jul 2003 21:25:07 -0000	1.3
+++ openacs-4/contrib/packages/project-manager/www/index.adp	31 Jul 2003 20:11:41 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
 <link rel="stylesheet" href="style.css" type="text/css">
 
-<property name="title">@title@</property>
+<property name="title">Projects</property>
 <property name="context">@context@</property>
 
 My projects | All projects | My tasks | All tasks | Processes
Index: openacs-4/contrib/packages/project-manager/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/www/index.tcl	30 Jul 2003 21:25:07 -0000	1.3
+++ openacs-4/contrib/packages/project-manager/www/index.tcl	31 Jul 2003 20:11:41 -0000	1.4
@@ -11,24 +11,35 @@
 
 } -properties {
 
-    title:onevalue
     context:onevalue
     projects:multirow
+    write_p:onevalue
+    create_p:onevalue
 }
 
 # --------------------------------------------------------------- #
 
-set title "Projects"
+# set up context bar
 set context [list]
-set indent_pattern "&nbsp;"
-set indent_factor [parameter::get -parameter IndentationFactor -default 5]
 
+# the unique identifier for this package
 set package_id [ad_conn package_id]
+set user_id    [ad_maybe_redirect_for_registration]
 
-set false f
+# permissions
+permission::require_permission -party_id $user_id -object_id $package_id -privilege read
 
-set root_folder [db_string get_root "select pm_project__get_root_folder (:package_id, :false)"]
+set write_p  [permission::permission_p -object_id $package_id -privilege write] 
+set create_p [permission::permission_p -object_id $package_id -privilege create]
 
+# root CR folder
+set root_folder [db_string get_root "select pm_project__get_root_folder (:package_id, 'f')"]
+
+# set up for indentation of hierarchy
+set indent_pattern "&nbsp;"
+set indent_factor [parameter::get -parameter IndentationFactor -default 5]
+
+
 db_multirow projects project_folders {}
 
 ad_return_template
Index: openacs-4/contrib/packages/project-manager/www/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/www/one.tcl	30 Jul 2003 20:42:05 -0000	1.3
+++ openacs-4/contrib/packages/project-manager/www/one.tcl	31 Jul 2003 20:11:41 -0000	1.4
@@ -32,12 +32,26 @@
     planned_end_date:onevalue
     ongoing_p:onevalue
     tasks:multirow
+    write_p:onevalue
+    create_p:onevalue
 }
 
 # --------------------------------------------------------------- #
 
+# set up context bar
 set context_bar [ad_context_bar "View"]
 
+# the unique identifier for this package
+set package_id [ad_conn package_id]
+set user_id    [ad_maybe_redirect_for_registration]
+
+# permissions
+permission::require_permission -party_id $user_id -object_id $package_id -privilege read
+
+set write_p  [permission::permission_p -object_id $package_id -privilege write] 
+set create_p [permission::permission_p -object_id $package_id -privilege create]
+
+
 db_multirow tasks project_tasks_query { }
 
 db_1row project_query {	}
Index: openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql	30 Jul 2003 23:36:08 -0000	1.2
+++ openacs-4/contrib/packages/project-manager/www/task-add-edit-postgresql.xql	31 Jul 2003 20:11:41 -0000	1.3
@@ -39,19 +39,20 @@
   <fullquery name="task_query">
     <querytext>
       select
-        task_revision_id,
-        title as task_title,
-        item_id,
-        description,
-        name,
-        parent_id,
-	to_char(start_date,'YYYY MM DD') as start_date,
-	to_char(end_date,'YYYY MM DD') as end_date,
-        percent_complete
+        t.task_revision_id,
+        t.title as task_title,
+        t.item_id,
+        t.description,
+        t.name,
+        t.parent_id,
+	to_char(t.start_date,'YYYY MM DD') as start_date,
+	to_char(t.end_date,'YYYY MM DD') as end_date,
+        t.percent_complete
 	FROM
-	pm_tasks_revisionsx
+	pm_tasks_revisionsx t, cr_items i
         WHERE
-        item_id = :task_id
+        t.item_id = :task_id and
+        t.revision_id = i.live_revision
     </querytext>
   </fullquery>
 </queryset>
Index: openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-add-edit.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl	30 Jul 2003 23:36:08 -0000	1.2
+++ openacs-4/contrib/packages/project-manager/www/task-add-edit.tcl	31 Jul 2003 20:11:41 -0000	1.3
@@ -35,20 +35,26 @@
 
 }
 
+# --------------------------------------------------------------- #
+
 set user_id [ad_maybe_redirect_for_registration]
 
+# the unique identifier for this package
 set package_id [ad_conn package_id]
+set user_id    [ad_maybe_redirect_for_registration]
 
+# permissions
+
 if {[exists_and_not_null task_id]} {
     set title "Edit a task"
-    set context_bar [ad_context_bar "Edit Task"]
+    set context_bar [ad_context_bar [list "one?item_id=$project_item_id&project_id=$project_id" "One Project"] "Edit Task"]
+    permission::require_permission -party_id $user_id -object_id $package_id -privilege write
 } else {
     set title "Add a task"
-    set context_bar [ad_context_bar "New Task"]
+    set context_bar [ad_context_bar [list "one?item_id=$project_item_id&project_id=$project_id" "One Project"] "New Task"]
+    permission::require_permission -party_id $user_id -object_id $package_id -privilege create
 }
 
-ns_log Notice "before add_edit"
-
 ad_form -name add_edit -form {
     task_id:key
 
@@ -90,8 +96,6 @@
 
 } -select_query_name task_query -on_submit {
 
-    ns_log Notice "in select_query_name"
-
     set user_id [ad_conn user_id]
     set peeraddr [ad_conn peeraddr]
 
Index: openacs-4/contrib/packages/project-manager/www/task-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/project-manager/www/task-one.tcl	30 Jul 2003 23:36:08 -0000	1.2
+++ openacs-4/contrib/packages/project-manager/www/task-one.tcl	31 Jul 2003 20:11:41 -0000	1.3
@@ -21,12 +21,25 @@
     start_date:onevalue
     end_date:onevalue
     percent_complete:onevalue
+    write_p:onevalue
+    create_p:onevalue
 }
 
 # --------------------------------------------------------------- #
 
 set context_bar [ad_context_bar "one?item_id=$project_item_id&project_id=$project_id Project" "View"]
 
+# the unique identifier for this package
+set package_id [ad_conn package_id]
+set user_id    [ad_maybe_redirect_for_registration]
+
+# permissions
+permission::require_permission -party_id $user_id -object_id $package_id -privilege read
+
+set write_p  [permission::permission_p -object_id $package_id -privilege write] 
+set create_p [permission::permission_p -object_id $package_id -privilege create]
+
+
 db_1row task_query { }
 
 ad_return_template