Index: openacs-4/packages/bug-tracker/tcl/bug-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-procs-postgresql.xql,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/bug-tracker/tcl/bug-procs-postgresql.xql	13 Jan 2005 13:56:15 -0000	1.9
+++ openacs-4/packages/bug-tracker/tcl/bug-procs-postgresql.xql	24 Feb 2005 13:33:03 -0000	1.10
@@ -68,60 +68,6 @@
     </querytext>
 </fullquery>
 
-
-
-
-
-<fullquery name="bug_tracker::bug::get_list.select_categories">
-  <querytext>
-        select kw.heading,
-               km.keyword_id,
-               count(b.bug_id)
-        from   cr_keywords kw join
-               cr_item_keyword_map km using (keyword_id) left outer join
-               bt_bugs b on (b.bug_id = km.item_id)
-        where  kw.parent_id = :parent_id
-        and    b.project_id = :package_id
-        group  by kw.heading, km.keyword_id
-        order  by kw.heading
-
-  </querytext>
-</fullquery>
-
-
-
-<fullquery name="bug_tracker::bug::get_list.select_action_assignees">
-  <querytext>
-    select p.first_names || ' ' || p.last_name as name,
-           crum.user_id,
-           count(b.bug_id) as num_bugs
-    from   bt_bugs b,
-           workflow_case_assigned_actions aa left outer join
-           workflow_case_role_user_map crum on (crum.case_id = aa.case_id and crum.role_id = aa.role_id) left outer join
-           persons p on (p.person_id = crum.user_id)
-    where  b.project_id = :package_id
-    and    aa.workflow_id = :workflow_id
-    and    aa.action_id = :action_id
-    and    aa.object_id = b.bug_id
-    group  by p.first_names, p.last_name, crum.user_id
-  </querytext>
-</fullquery>
-
-<fullquery name="bug_tracker::bug::get_list.select_fix_for_versions">
-  <querytext>
-
-        select v.version_name,
-               b.fix_for_version,
-               count(b.bug_id) as num_bugs
-        from   bt_bugs b left outer join 
-               bt_versions v on (v.version_id = b.fix_for_version)
-        where  b.project_id = :package_id
-        group  by b.fix_for_version, v.anticipated_freeze_date, v.version_name
-        order  by v.anticipated_freeze_date, v.version_name
-
-  </querytext>
-</fullquery>
-
   <partialquery name="bug_tracker::bug::get_list.category_where_clause">
       <querytext>
          content_keyword__is_assigned(b.bug_id, :f_category_$parent_id, 'none') = 't'
@@ -151,13 +97,60 @@
      allows user to break this assumption you'll also need to deal with
      this.
 -->
+<fullquery name="bug_tracker::bug::get_query.bugs_pagination">
+  <querytext>
+    select b.bug_id,
+           b.project_id,
+           b.bug_number,
+           b.summary,
+           lower(b.summary) as lower_summary,
+           b.comment_content,
+           b.comment_format,
+           b.component_id,
+           b.creation_date,
+           to_char(b.creation_date, 'fmMM/DDfm/YYYY') as creation_date_pretty,
+           b.creation_user as submitter_user_id,
+           submitter.first_names as submitter_first_names,
+           submitter.last_name as submitter_last_name,
+           submitter.email as submitter_email,
+           lower(submitter.first_names) as lower_submitter_first_names,
+           lower(submitter.last_name) as lower_submitter_last_name,
+           lower(submitter.email) as lower_submitter_email,
+           st.pretty_name as pretty_state,
+           st.short_name as state_short_name,
+           st.state_id,
+           st.hide_fields,
+           b.resolution,
+           b.found_in_version,
+           b.fix_for_version,
+           b.fixed_in_version,
+           cas.case_id
+           $more_columns
+    from $from_bug_clause,
+         acs_users_all submitter,
+         workflow_cases cas,
+         workflow_case_fsm cfsm,
+         workflow_fsm_states st 
+    where submitter.user_id = b.creation_user
+      and cas.workflow_id = :workflow_id
+      and cas.object_id = b.bug_id
+      and cfsm.case_id = cas.case_id
+      and cfsm.parent_enabled_action_id is null
+      and st.state_id = cfsm.current_state 
+      $orderby_category_where_clause
+    [template::list::filter_where_clauses -and -name "bugs"]
+    [template::list::orderby_clause -orderby -name "bugs"]
+  </querytext>
+</fullquery>
+
 <fullquery name="bug_tracker::bug::get_query.bugs">
   <querytext>
 select q.*,
        km.keyword_id,
        assign_info.*
 from (
   select b.bug_id,
+         b.project_id,
          b.bug_number,
          b.summary,
          lower(b.summary) as lower_summary,
@@ -195,7 +188,7 @@
      and cfsm.parent_enabled_action_id is null
      and st.state_id = cfsm.current_state 
    $orderby_category_where_clause
-   [template::list::filter_where_clauses -and -name "bugs"]
+   [template::list::page_where_clause -and -name bugs -key bug_id]
 ) q
 left outer join
   cr_item_keyword_map km
@@ -225,11 +218,12 @@
   <partialquery name="bug_tracker::bug::get_list.filter_assignee_null_where_clause">
       <querytext>
           exists (select 1
-                  from   workflow_case_assigned_actions aa left outer join
-                         workflow_case_role_user_map crum on (crum.case_id = aa.case_id and crum.role_id = aa.role_id)
-                  where  aa.case_id = cas.case_id
-                  and    aa.action_id = $action_id
-                  and    crum.user_id is null
+                  from workflow_case_assigned_actions aa left outer join
+                    workflow_case_role_party_map wcrpm
+                      on (wcrpm.case_id = aa.case_id and wcrpm.role_id = aa.role_id)
+                  where aa.case_id = cas.case_id
+                    and aa.action_id = $action_id
+                    and wcrpm.party_id is null
                  )
       </querytext>
   </partialquery>