Index: openacs-4/packages/project-manager-portlet/lib/tasks-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager-portlet/lib/tasks-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager-portlet/lib/tasks-postgresql.xql 12 Aug 2005 22:31:21 -0000 1.1
+++ openacs-4/packages/project-manager-portlet/lib/tasks-postgresql.xql 13 Aug 2005 15:18:47 -0000 1.2
@@ -37,8 +37,7 @@
r.is_lead_p,
t.priority,
p.customer_id,
- p.title as project_name,
- ar.object_id_two as logger_project
+ p.title as project_name
FROM
(select tr.item_id,
ta.party_id,
@@ -74,67 +73,6 @@
i.item_id = d.task_id,
pm_tasks_active ti,
pm_task_status s,
- pm_projectsx p,
- acs_rels ar,
- acs_objects o
- WHERE
- t.parent_id = p.item_id and
- t.revision_id = i.live_revision and
- t.item_id = ti.task_id and
- ti.status = s.status_id
- $party_where_clause
- and ar.object_id_one = t.parent_id
- and ar.rel_type = 'application_data_link'
- and o.object_id = ar.object_id_two
- and o.object_type = 'logger_project'
- and exists (select 1 from acs_object_party_privilege_map ppm
- where ppm.object_id = ti.task_id
- and ppm.privilege = 'read'
- and ppm.party_id = :user_id)
- $done_clause
- [template::list::filter_where_clauses -and -name tasks]
-
-
-
-
-
- select distinct task_item_id from (SELECT
- t.item_id as task_item_id
- FROM
- (select tr.item_id,
- ta.party_id,
- ta.role_id,
- tr.title,
- tr.end_date,
- tr.earliest_start,
- tr.earliest_finish,
- tr.latest_start,
- tr.latest_finish,
- tr.percent_complete,
- tr.estimated_hours_work,
- tr.estimated_hours_work_min,
- tr.estimated_hours_work_max,
- tr.actual_hours_worked,
- tr.parent_id,
- tr.revision_id,
- tr.priority
- from pm_tasks_revisionsx tr
- LEFT JOIN
- pm_task_assignment ta ON tr.item_id = ta.task_id) t
- LEFT JOIN
- persons u
- ON
- t.party_id = u.person_id
- LEFT JOIN
- pm_roles r
- ON t.role_id = r.role_id,
- cr_items i
- LEFT JOIN
- pm_task_dependency d
- ON
- i.item_id = d.task_id,
- pm_tasks_active ti,
- pm_task_status s,
pm_projectsx p
WHERE
t.parent_id = p.item_id and
@@ -151,4 +89,5 @@
+
Index: openacs-4/packages/project-manager-portlet/lib/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager-portlet/lib/tasks.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager-portlet/lib/tasks.tcl 12 Aug 2005 22:31:21 -0000 1.1
+++ openacs-4/packages/project-manager-portlet/lib/tasks.tcl 13 Aug 2005 15:18:47 -0000 1.2
@@ -128,7 +128,7 @@
# Get the rows to display
if {![exists_and_not_null elements]} {
- set elements [list task_item_id title slack_time role latest_start latest_finish status_type remaining worked project_item_id percent_complete log_url edit_url]
+ set elements [list task_item_id title slack_time role latest_start latest_finish status_type remaining worked project_item_id percent_complete edit_url]
}
set filters [list \
@@ -204,7 +204,7 @@
}
if {$bulk_p == 1} {
- set bulk_actions [list "[_ project-manager.Log_hours]" "${base_url}log-bulk" "[_ project-manager.lt_Log_hours_for_several]" "[_ project-manager.Edit_tasks]" "${base_url}task-add-edit" "[_ project-manager.Edit_multiple_tasks]"]
+ set bulk_actions [list "[_ project-manager.Edit_tasks]" "${base_url}task-add-edit" "[_ project-manager.Edit_multiple_tasks]"]
set bulk_action_export_vars [list [list return_url]]
} else {
set bulk_actions [list]
@@ -313,9 +313,6 @@
display_template {@tasks.project_name@}
hide_p {[ad_decode [exists_and_not_null project_item_id] 1 1 0]}
}
- log_url {
- display_template {L}
- }
edit_url {
display_template {E}
}
@@ -336,10 +333,6 @@
-actions $actions \
-bulk_actions $bulk_actions \
-bulk_action_export_vars $bulk_action_export_vars \
- -page_size_variable_p 1 \
- -page_size $page_size \
- -page_flush_p 0 \
- -page_query_name tasks_pagination \
-html {
width 100%
} \
@@ -357,14 +350,11 @@
}
}
-db_multirow -extend {item_url earliest_start_pretty earliest_finish_pretty end_date_pretty latest_start_pretty latest_finish_pretty slack_time edit_url log_url hours_remaining days_remaining actual_days_worked my_user_id user_url base_url task_close_url project_url} tasks tasks {} {
+db_multirow -extend {item_url earliest_start_pretty earliest_finish_pretty end_date_pretty latest_start_pretty latest_finish_pretty slack_time edit_url hours_remaining days_remaining actual_days_worked my_user_id user_url base_url task_close_url project_url} tasks tasks {} {
set item_url [export_vars \
-base "task-one" {{task_id $task_item_id}}]
- set log_url [export_vars \
- -base "${logger_url}log" {{project_id $logger_project} {pm_task_id $task_item_id} {pm_project_id $project_item_id} {return_url $return_url}}]
-
set edit_url [export_vars \
-base "task-add-edit" {{task_id $task_item_id} project_item_id return_url}]
Index: openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.tcl 11 Aug 2005 17:39:17 -0000 1.6
+++ openacs-4/packages/project-manager-portlet/www/project-manager-task-portlet.tcl 13 Aug 2005 15:18:47 -0000 1.7
@@ -24,10 +24,10 @@
set base_url "project-manager/"
set pm_package_id [dotlrn_community::get_package_id_from_package_key -package_key "project-manager" -community_id $community_id]
set party_id ""
- set elements "task_item_id title role latest_finish status_type project_item_id log_url edit_url"
+ set elements "task_item_id title role latest_finish status_type project_item_id edit_url"
} else {
- set elements "task_item_id title latest_finish status_type project_item_id log_url edit_url"
+ set elements "task_item_id title latest_finish status_type project_item_id edit_url"
set party_id [ad_conn user_id]
set base_url ""
set pm_package_id ""