Index: openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl,v
diff -u -N -r1.21 -r1.22
--- openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl 4 Dec 2005 15:06:55 -0000 1.21
+++ openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl 14 Dec 2005 22:03:24 -0000 1.22
@@ -161,10 +161,9 @@
# Try to retrieve the project_id from the folder
set project_id [db_string get_project_id_from_folder {
select r.object_id_two as project_id
- from acs_rels r, cr_items i, cr_items p
+ from acs_data_links r, cr_items i, cr_items p
where i.item_id = :folder_id
and r.object_id_one = i.parent_id
- and r.rel_type = 'application_data_link'
and r.object_id_two = p.item_id
and p.content_type = 'pm_project'
} -default ""]
Index: openacs-4/packages/invoices/lib/projects-billable.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/projects-billable.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/invoices/lib/projects-billable.xql 15 Nov 2005 17:48:52 -0000 1.5
+++ openacs-4/packages/invoices/lib/projects-billable.xql 14 Dec 2005 22:06:38 -0000 1.6
@@ -27,7 +27,7 @@
cr_revisions pr,
pm_projects p,
acs_objects o,
- acs_rels r,
+ acs_data_links r,
iv_offer_items ofi,
acs_objects oo,
cr_items oi,
@@ -38,7 +38,6 @@
and o.object_id = p.project_id
and r.object_id_one = pi.item_id
and r.object_id_two = oi.item_id
- and r.rel_type = 'application_data_link'
and p.status_id = :p_closed_id
and ofi.offer_id = oi.latest_revision
and oo.object_id = oi.item_id
Index: openacs-4/packages/invoices/lib/report-offer-items.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/report-offer-items.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/invoices/lib/report-offer-items.xql 15 Nov 2005 22:38:04 -0000 1.1
+++ openacs-4/packages/invoices/lib/report-offer-items.xql 14 Dec 2005 22:06:38 -0000 1.2
@@ -17,7 +17,7 @@
iv_offer_itemsx oi,
iv_offersx iv,
category_object_map com,
- acs_rels rel,
+ acs_data_links rel,
pm_projectsx p,
cr_items i,
cr_items i2
@@ -27,7 +27,6 @@
and oi.offer_id = i.latest_revision
and oi.offer_item_id = com.object_id
and rel.object_id_one = iv.item_id
- and rel.rel_type = 'application_data_link'
and rel.object_id_two = p.item_id
and p.item_id = i2.item_id
and i2.latest_revision = p.project_id
@@ -47,7 +46,7 @@
iv_offersx iv,
category_object_map com,
cr_items i,
- acs_rels rel,
+ acs_data_links rel,
pm_projectsx p,
cr_items i2
where
@@ -56,7 +55,6 @@
and oi.offer_id = i.latest_revision
and oi.offer_item_id = com.object_id
and rel.object_id_one = iv.item_id
- and rel.rel_type = 'application_data_link'
and rel.object_id_two = p.item_id
and p.item_id = i2.item_id
and i2.latest_revision = p.project_id
@@ -109,7 +107,7 @@
iv_offersx iv,
category_object_map com,
cr_items i,
- acs_rels rel,
+ acs_data_links rel,
pm_projectsx p,
cr_items i2
where
@@ -118,7 +116,6 @@
and oi.offer_id = i.latest_revision
and oi.offer_item_id = com.object_id
and rel.object_id_one = iv.item_id
- and rel.rel_type = 'application_data_link'
and rel.object_id_two = p.item_id
and p.item_id = i2.item_id
and i2.latest_revision = p.project_id
Index: openacs-4/packages/invoices/tcl/invoice-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/tcl/invoice-procs.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/invoices/tcl/invoice-procs.xql 14 Dec 2005 17:44:20 -0000 1.4
+++ openacs-4/packages/invoices/tcl/invoice-procs.xql 14 Dec 2005 22:06:38 -0000 1.5
@@ -43,7 +43,7 @@
pi.item_id as project_id
from iv_offer_items ofi, cr_items ci, cr_revisions cr,
category_object_map m, iv_invoice_items ii, cr_revisions oor,
- acs_rels r, cr_items pi, cr_revisions pr, pm_projects p
+ acs_data_links r, cr_items pi, cr_revisions pr, pm_projects p
where ci.latest_revision = ii.invoice_id
and cr.revision_id = ii.iv_item_id
and ci.item_id = :invoice_id
@@ -52,7 +52,6 @@
and oor.revision_id = ofi.offer_id
and r.object_id_two = oor.item_id
and r.object_id_one = pi.item_id
- and r.rel_type = 'application_data_link'
and pi.latest_revision = pr.revision_id
and pr.revision_id = p.project_id
order by ii.sort_order
@@ -89,7 +88,7 @@
ofi.page_count, pr.title as project_title, p.project_code,
pi.item_id as project_id, o.credit_percent
from cr_items ci, cr_revisions cr, iv_invoice_items ii, cr_revisions oor,
- acs_rels r, cr_items pi, cr_revisions pr, pm_projects p, iv_offers o,
+ acs_data r, cr_items pi, cr_revisions pr, pm_projects p, iv_offers o,
iv_offer_items ofi
left outer join category_object_map m on (m.object_id = ofi.offer_item_id)
where ci.latest_revision = ii.invoice_id
@@ -99,7 +98,6 @@
and oor.revision_id = ofi.offer_id
and r.object_id_two = oor.item_id
and r.object_id_one = pi.item_id
- and r.rel_type = 'application_data_link'
and pi.latest_revision = pr.revision_id
and pr.revision_id = p.project_id
and o.offer_id = ofi.offer_id
Index: openacs-4/packages/invoices/tcl/invoices-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/tcl/invoices-callback-procs.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/invoices/tcl/invoices-callback-procs.tcl 14 Dec 2005 17:44:20 -0000 1.9
+++ openacs-4/packages/invoices/tcl/invoices-callback-procs.tcl 14 Dec 2005 22:06:38 -0000 1.10
@@ -313,11 +313,10 @@
set already_offer_p [db_0or1row check_for_offer {
select of.offer_id as credit_offer_rev_id
- from iv_offers of, cr_items oi, acs_rels r,
+ from iv_offers of, cr_items oi, acs_data_links r,
pm_projects p, cr_items pi
where r.object_id_one = pi.item_id
and r.object_id_two = oi.item_id
- and r.rel_type = 'application_data_link'
and oi.latest_revision = of.offer_id
and of.status = 'credit'
and pi.latest_revision = p.project_id
Index: openacs-4/packages/invoices/tcl/offer-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/tcl/offer-procs.xql,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/invoices/tcl/offer-procs.xql 26 Oct 2005 12:33:37 -0000 1.6
+++ openacs-4/packages/invoices/tcl/offer-procs.xql 14 Dec 2005 22:06:38 -0000 1.7
@@ -73,15 +73,14 @@
t.organization_id, pr.title as project_title, ci.item_id as offer_id,
pp.project_code, pi.item_id as project_id
from iv_offers t, cr_revisions cr, cr_items ci, acs_objects o,
- persons p, acs_rels r, cr_items pi, cr_revisions pr, pm_projects pp
+ persons p, acs_data_links r, cr_items pi, cr_revisions pr, pm_projects pp
where cr.revision_id = t.offer_id
and ci.latest_revision = cr.revision_id
and ci.item_id = :offer_id
and o.object_id = t.offer_id
and p.person_id = o.creation_user
and r.object_id_two = ci.item_id
and r.object_id_one = pi.item_id
- and r.rel_type = 'application_data_link'
and pi.latest_revision = pr.revision_id
and pr.revision_id = pp.project_id
Index: openacs-4/packages/invoices/tcl/price-list-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/tcl/price-list-procs.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/invoices/tcl/price-list-procs.xql 16 Aug 2005 20:04:32 -0000 1.1
+++ openacs-4/packages/invoices/tcl/price-list-procs.xql 14 Dec 2005 22:06:38 -0000 1.2
@@ -6,13 +6,12 @@
select l.currency
- from acs_objects o, acs_rels r, iv_price_lists l, cr_items li
+ from acs_objects o, acs_data_links r, iv_price_lists l, cr_items li
where o.object_id = l.list_id
and o.package_id = :package_id
and l.list_id = li.latest_revision
and r.object_id_one = li.item_id
and r.object_id_two = :organization_id
- and r.rel_type = 'application_data_link'
@@ -26,10 +25,9 @@
and o.package_id = :package_id
and l.list_id = li.latest_revision
and not exists (select 1
- from acs_rels r, acs_objects o
+ from acs_data_links r, acs_objects o
where r.object_id_one = li.item_id
and r.object_id_two = o.object_id
- and r.rel_type = 'application_data_link'
and o.object_type = 'organization')
@@ -39,13 +37,12 @@
select li.item_id as list_id
- from acs_objects o, acs_rels r, iv_price_lists l, cr_items li
+ from acs_objects o, acs_data_links r, iv_price_lists l, cr_items li
where o.object_id = l.list_id
and o.package_id = :package_id
and l.list_id = li.latest_revision
and r.object_id_one = li.item_id
and r.object_id_two = :organization_id
- and r.rel_type = 'application_data_link'
@@ -59,10 +56,9 @@
and o.package_id = :package_id
and l.list_id = li.latest_revision
and not exists (select 1
- from acs_rels r, acs_objects o
+ from acs_data_links r, acs_objects o
where r.object_id_one = li.item_id
and r.object_id_two = o.object_id
- and r.rel_type = 'application_data_link'
and o.object_type = 'organization')
Index: openacs-4/packages/invoices/tcl/price-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/tcl/price-procs.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/invoices/tcl/price-procs.xql 16 Aug 2005 20:04:32 -0000 1.1
+++ openacs-4/packages/invoices/tcl/price-procs.xql 14 Dec 2005 22:06:38 -0000 1.2
@@ -6,7 +6,7 @@
select p.amount, l.currency
- from iv_prices p, cr_items pi, acs_objects o, acs_rels r,
+ from iv_prices p, cr_items pi, acs_objects o, acs_data_links r,
iv_price_lists l, cr_items li, category_object_map cm
where p.price_id = pi.latest_revision
and cm.category_id = p.category_id
@@ -17,7 +17,6 @@
and l.list_id = li.latest_revision
and r.object_id_one = li.item_id
and r.object_id_two = :organization_id
- and r.rel_type = 'application_data_link'
@@ -36,10 +35,9 @@
and p.list_id = li.item_id
and l.list_id = li.latest_revision
and not exists (select 1
- from acs_rels r, acs_objects o
+ from acs_data_links r, acs_objects o
where r.object_id_one = li.item_id
and r.object_id_two = o.object_id
- and r.rel_type = 'application_data_link'
and o.object_type = 'organization')
Index: openacs-4/packages/invoices/www/invoice-ae-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/invoice-ae-postgresql.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/invoices/www/invoice-ae-postgresql.xql 16 Aug 2005 20:04:34 -0000 1.1
+++ openacs-4/packages/invoices/www/invoice-ae-postgresql.xql 14 Dec 2005 22:06:38 -0000 1.2
@@ -20,10 +20,9 @@
select sum(o.amount_sum - o.amount_total) as open_rebate
- from iv_offers o, acs_rels r, cr_items co
+ from iv_offers o, acs_data_links r, cr_items co
where r.object_id_one in ([join $project_id ,])
and r.object_id_two = co.item_id
- and r.rel_type = 'application_data_link'
and co.latest_revision = o.offer_id
@@ -40,11 +39,10 @@
and ci.latest_revision = i.invoice_id
and i.invoice_id in (select ii.invoice_id
from iv_invoice_items ii, iv_offer_items oi,
- cr_items co, acs_rels r
+ cr_items co, acs_data_links r
where oi.offer_id = co.latest_revision
and r.object_id_one in ([join $project_id ,])
and r.object_id_two = co.item_id
- and r.rel_type = 'application_data_link'
and oi.offer_item_id = ii.offer_item_id)
Index: openacs-4/packages/invoices/www/invoice-ae.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/invoice-ae.xql,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/invoices/www/invoice-ae.xql 9 Dec 2005 18:26:33 -0000 1.8
+++ openacs-4/packages/invoices/www/invoice-ae.xql 14 Dec 2005 22:06:38 -0000 1.9
@@ -21,14 +21,13 @@
select cp.item_id
from cr_items ci, cr_items co, cr_items cp, iv_invoice_items ii,
- iv_offer_items oi, pm_projects p, acs_rels r
+ iv_offer_items oi, pm_projects p, acs_data_links r
where ci.item_id = :invoice_id
and ii.invoice_id = ci.latest_revision
and oi.offer_item_id = ii.offer_item_id
and oi.offer_id = co.latest_revision
and r.object_id_one = co.item_id
and r.object_id_two = cp.item_id
- and r.rel_type = 'application_data_link'
and p.project_id = cp.latest_revision
@@ -79,14 +78,13 @@
ofi.price_per_unit, ofi.item_nr, pi.item_id as project_id, of.credit_percent,
pr.title as project_title, ofi.vat, ofi.rebate, m.category_id
from cr_items oi, cr_revisions cr, cr_items pi, cr_revisions pr,
- acs_objects o, acs_rels r, iv_offers of, iv_offer_items ofi
+ acs_objects o, acs_data_links r, iv_offers of, iv_offer_items ofi
left outer join category_object_map m on (m.object_id = ofi.offer_item_id)
where o.object_id = ofi.offer_id
and o.package_id = :package_id
and oi.latest_revision = ofi.offer_id
and r.object_id_one = pi.item_id
and r.object_id_two = oi.item_id
- and r.rel_type = 'application_data_link'
and pr.revision_id = pi.latest_revision
and pi.item_id in ([join $project_id ,])
and cr.revision_id = ofi.offer_item_id
@@ -110,7 +108,7 @@
i.vat as old_vat, i.rebate, m.category_id, i.offer_item_id,
of.credit_percent
from cr_items oi, iv_invoice_items i, cr_revisions ir, cr_items pi,
- cr_revisions pr, iv_offers of, cr_items vi, cr_items ii, acs_rels r,
+ cr_revisions pr, iv_offers of, cr_items vi, cr_items ii, acs_data_links r,
iv_offer_items ofi
left outer join category_object_map m on (m.object_id = ofi.offer_item_id)
where oi.latest_revision = ofi.offer_id
@@ -121,7 +119,6 @@
and vi.item_id = :invoice_id
and r.object_id_one = pi.item_id
and r.object_id_two = oi.item_id
- and r.rel_type = 'application_data_link'
and pr.revision_id = pi.latest_revision
and of.offer_id = ofi.offer_id
order by pi.item_id, i.item_nr
@@ -148,11 +145,10 @@
sum(o.vat) as vat,
sum(o.amount_total) as amount_total,
sum(o.amount_sum) as amount_sum
- from iv_offers o, cr_items i, acs_rels r
+ from iv_offers o, cr_items i, acs_data_links r
where o.offer_id = i.latest_revision
and r.object_id_one in ([join $project_id ,])
and r.object_id_two = i.item_id
- and r.rel_type = 'application_data_link'
@@ -196,11 +192,10 @@
select of.offer_id as credit_offer_rev_id
- from iv_offers of, cr_items oi, acs_rels r,
+ from iv_offers of, cr_items oi, acs_data_links r,
acs_objects o, pm_projects p, cr_items pi
where r.object_id_one = pi.item_id
and r.object_id_two = oi.item_id
- and r.rel_type = 'application_data_link'
and oi.latest_revision = of.offer_id
and of.status = 'credit'
and o.object_id = of.offer_id
@@ -217,11 +212,10 @@
select ofi.offer_id as credit_offer_rev_id,
oi.item_id as credit_offer_item_id
- from iv_offers of, cr_items i, acs_objects o, acs_rels r,
+ from iv_offers of, cr_items i, acs_objects o, acs_data_links r,
iv_offer_items ofi, cr_items oi, pm_projects p, cr_items pi
where r.object_id_one = pi.item_id
and r.object_id_two = i.item_id
- and r.rel_type = 'application_data_link'
and o.object_id = of.offer_id
and o.package_id = :package_id
and of.offer_id = ofi.offer_id
Index: openacs-4/packages/invoices/www/invoice-cancellation.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/invoice-cancellation.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/invoices/www/invoice-cancellation.xql 27 Oct 2005 18:11:24 -0000 1.3
+++ openacs-4/packages/invoices/www/invoice-cancellation.xql 14 Dec 2005 22:06:38 -0000 1.4
@@ -27,11 +27,10 @@
select of.offer_id as credit_offer_rev_id
- from iv_offers of, cr_items oi, acs_rels r,
+ from iv_offers of, cr_items oi, acs_data_links r,
acs_objects o, pm_projects p, cr_items pi
where r.object_id_one = pi.item_id
and r.object_id_two = oi.item_id
- and r.rel_type = 'application_data_link'
and oi.latest_revision = of.offer_id
and of.status = 'credit'
and o.object_id = of.offer_id
Index: openacs-4/packages/invoices/www/offer-ae.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/offer-ae.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/invoices/www/offer-ae.xql 27 Oct 2005 17:24:39 -0000 1.5
+++ openacs-4/packages/invoices/www/offer-ae.xql 14 Dec 2005 22:06:38 -0000 1.6
@@ -41,16 +41,14 @@
select r.title, r.item_id
- from cr_revisions r, cr_items i, pm_projects p, acs_rels ar
+ from cr_revisions r, cr_items i, pm_projects p, acs_data_links ar
where ar.object_id_one = :organization_id
and ar.object_id_two = r.revision_id
- and ar.rel_type = 'application_data_link'
and i.latest_revision = r.revision_id
and p.project_id = r.revision_id
and i.item_id not in (select ar2.object_id_one
- from acs_rels ar2, cr_items oi, iv_offers o
+ from acs_data_links ar2, cr_items oi, iv_offers o
where ar2.object_id_two = oi.item_id
- and ar2.rel_type = 'application_data_link'
and oi.latest_revision = o.offer_id)
order by r.title desc
Index: openacs-4/packages/invoices-portlet/catalog/invoices-portlet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices-portlet/catalog/invoices-portlet.en_US.ISO-8859-1.xml,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/invoices-portlet/catalog/invoices-portlet.en_US.ISO-8859-1.xml 26 Oct 2005 22:45:10 -0000 1.3
+++ openacs-4/packages/invoices-portlet/catalog/invoices-portlet.en_US.ISO-8859-1.xml 14 Dec 2005 22:07:38 -0000 1.4
@@ -1,5 +1,5 @@
-
+
Invoice Admin
Invoices Administration
Index: openacs-4/packages/invoices-portlet/lib/projects-billable.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices-portlet/lib/projects-billable.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/invoices-portlet/lib/projects-billable.xql 28 Oct 2005 18:16:49 -0000 1.4
+++ openacs-4/packages/invoices-portlet/lib/projects-billable.xql 14 Dec 2005 22:07:38 -0000 1.5
@@ -28,7 +28,7 @@
cr_revisions pr,
pm_projects p,
acs_objects o,
- acs_rels r,
+ acs_data_links r,
iv_offer_items ofi,
acs_objects oo,
cr_items oi ,
@@ -39,7 +39,6 @@
and o.object_id = p.project_id
and r.object_id_one = pi.item_id
and r.object_id_two = oi.item_id
- and r.rel_type = 'application_data_link'
and p.status_id = :p_closed_id
and ofi.offer_id = oi.latest_revision
and oo.object_id = oi.item_id
Index: openacs-4/packages/logger/lib/entries.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/lib/entries.tcl,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/logger/lib/entries.tcl 24 Nov 2005 16:44:49 -0000 1.18
+++ openacs-4/packages/logger/lib/entries.tcl 14 Dec 2005 22:04:19 -0000 1.19
@@ -490,9 +490,8 @@
from
cr_items i,
cr_revisions r,
- acs_rels ar
+ acs_data_links ar
where r.item_id = ar.object_id_one and
- ar.rel_type = 'application_data_link' and
i.live_revision = r.revision_id) task
ON le.entry_id = task.logger_entry,
}
Index: openacs-4/packages/logger/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/apm-callback-procs.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/logger/tcl/apm-callback-procs.tcl 14 Dec 2005 17:37:20 -0000 1.10
+++ openacs-4/packages/logger/tcl/apm-callback-procs.tcl 14 Dec 2005 22:04:20 -0000 1.11
@@ -174,9 +174,8 @@
update logger_entries
set project_id = :logger_project
where entry_id in (select object_id_two
- from acs_rels
- where object_id_one = :task_id
- and rel_type = 'application_data_link')
+ from acs_data_links
+ where object_id_one = :task_id)
}
}
Index: openacs-4/packages/project-manager/lib/tasks-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/tasks-postgresql.xql,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/project-manager/lib/tasks-postgresql.xql 16 Nov 2005 15:06:08 -0000 1.20
+++ openacs-4/packages/project-manager/lib/tasks-postgresql.xql 14 Dec 2005 22:05:30 -0000 1.21
@@ -172,10 +172,9 @@
select
rel.object_id_two
from
- acs_rels rel,
+ acs_data_links rel,
acs_objects o
where
- rel_type ='application_data_link'
and object_id_two = o.object_id
and o.object_type = 'logger_project'
and rel.object_id_one = :parent_id
Index: openacs-4/packages/project-manager/tcl/task-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/task-procs.tcl,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/project-manager/tcl/task-procs.tcl 7 Oct 2005 09:53:36 -0000 1.17
+++ openacs-4/packages/project-manager/tcl/task-procs.tcl 14 Dec 2005 22:05:30 -0000 1.18
@@ -934,9 +934,8 @@
select sum(le.value)
from logger_entries le
where entry_id in (select object_id_two
- from acs_rels
- where object_id_one = :task_item_id
- and rel_type = 'application_data_link')
+ from acs_data_links
+ where object_id_one = :task_item_id)
and le.variable_id = :variable_id
" -default "0"]
Index: openacs-4/packages/project-manager/www/tasks-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/tasks-oracle.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/project-manager/www/tasks-oracle.xql 3 Jun 2005 22:13:44 -0000 1.2
+++ openacs-4/packages/project-manager/www/tasks-oracle.xql 14 Dec 2005 22:05:30 -0000 1.3
@@ -37,7 +37,7 @@
pm_roles r ,
cr_items proj,
pm_projectsx proj_rev,
- acs_rels ar,
+ acs_data_links ar,
acs_objects o
WHERE t.item_id = ta.task_id (+) and
ta.party_id = p.person_id (+) and
@@ -48,7 +48,6 @@
t.parent_id = proj.item_id and
proj.live_revision = proj_rev.revision_id 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'
[template::list::filter_where_clauses -and -name tasks]
Index: openacs-4/packages/project-manager/www/tasks-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/tasks-postgresql.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/project-manager/www/tasks-postgresql.xql 3 Jun 2005 22:13:44 -0000 1.4
+++ openacs-4/packages/project-manager/www/tasks-postgresql.xql 14 Dec 2005 22:05:30 -0000 1.5
@@ -45,7 +45,7 @@
cr_items proj,
cr_folders f,
pm_projectsx proj_rev,
- acs_rels ar,
+ acs_data_links ar,
acs_objects o
WHERE
ts.task_id = t.item_id and
@@ -57,7 +57,6 @@
and proj.parent_id = f.folder_id
and f.package_id = :package_id
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'
[template::list::page_where_clause -and -name "tasks" -key "ts.task_id"]
Index: openacs-4/packages/project-manager/www/lib/entries-table-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/lib/entries-table-oracle.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/project-manager/www/lib/entries-table-oracle.xql 3 Jun 2005 22:13:45 -0000 1.2
+++ openacs-4/packages/project-manager/www/lib/entries-table-oracle.xql 14 Dec 2005 22:05:30 -0000 1.3
@@ -18,9 +18,8 @@
submitter.first_names || ' ' || submitter.last_name as user_name
FROM logger_entries le ,
(SELECT r.title, ar.object_id_two
- FROM cr_items i, cr_revisions r, acs_rels ar
+ FROM cr_items i, cr_revisions r, acs_data_links ar
WHERE r.item_id = ar.object_id_one
- and ar.rel_type = 'application_data_link'
and i.live_revision = r.revision_id) task,
logger_projects lp,
acs_objects ao,
Index: openacs-4/packages/project-manager/www/lib/entries-table-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/lib/entries-table-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/project-manager/www/lib/entries-table-postgresql.xql 3 Jun 2005 22:13:45 -0000 1.2
+++ openacs-4/packages/project-manager/www/lib/entries-table-postgresql.xql 14 Dec 2005 22:05:30 -0000 1.3
@@ -20,9 +20,8 @@
FROM
logger_entries le
LEFT JOIN (select r.title, ar.object_id_two
- from cr_items i, cr_revisions r, acs_rels ar
+ from cr_items i, cr_revisions r, acs_data_links ar
where r.item_id = ar.object_id_one
- and ar.rel_type = 'application_data_link'
and i.live_revision = r.revision_id) task
ON le.entry_id = task.object_id_two,
logger_projects lp,
Index: openacs-4/packages/project-manager/www/lib/entries-table.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/lib/entries-table.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/project-manager/www/lib/entries-table.tcl 3 Jun 2005 22:13:45 -0000 1.3
+++ openacs-4/packages/project-manager/www/lib/entries-table.tcl 14 Dec 2005 22:05:30 -0000 1.4
@@ -58,7 +58,7 @@
# project manager task.
if { [exists_and_not_null pm_task_id] } {
- lappend where_clauses "le.entry_id in (select object_id_two from acs_rels where object_id_one = :pm_task_id and rel_type = 'application_data_link')"
+ lappend where_clauses "le.entry_id in (select object_id_two from acs_data_links where object_id_one = :pm_task_id)"
}