From: garyhgohoos <gary@xtuple.com>
Date: Mon, 18 Aug 2014 19:53:43 +0000 (-0400)
Subject: Issue #24272:add filters
X-Git-Tag: v4.7.0-beta.2~58^2
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=9a30793862f808498c4520e228e9a550518d7a41;p=xtuple

Issue #24272:add filters
---

diff --git a/foundation-database/public/tables/metasql/projects-detail_nohierarchy.mql b/foundation-database/public/tables/metasql/projects-detail_nohierarchy.mql
index ffcf3cef9..4edd40264 100644
--- a/foundation-database/public/tables/metasql/projects-detail_nohierarchy.mql
+++ b/foundation-database/public/tables/metasql/projects-detail_nohierarchy.mql
@@ -105,8 +105,23 @@ WHERE (true)
 <? if exists("id") ?>
   AND (prj_id=<? value("id") ?>)
 <? endif ?>
-<? literal("charClause") ?>
-<? if exists("prjtype_id") ?>
-   AND (prjtype_id = <? value("prjtype_id") ?>)
+<? if exists("prj_id") ?>
+  AND (prj_id=<? value("prj_id") ?>)
+<? endif ?>
+<? if exists("project_task") ?>
+  AND prj_id IN (SELECT DISTINCT prjtask_prj_id FROM prjtask where ((prjtask_number ~* <? value("project_task") ?>)
+						OR (prjtask_name ~* <? value("project_task") ?>)
+						OR (prjtask_descrip ~* <? value("project_task") ?>)))
+<? endif ?>
+<? if exists("cohead_id") ?>
+  AND prj_id IN (SELECT cohead_prj_id FROM cohead where cohead_id=<? value("cohead_id") ?>)
 <? endif ?>
+<? if exists("wo_id") ?>
+  AND prj_id IN (SELECT wo_prj_id FROM wo WHERE wo_id=<? value("wo_id") ?>)
+<? endif ?>
+<? if exists("pohead_id") ?>
+  AND prj_id IN (SELECT poitem_prj_id FROM pohead JOIN poitem ON (pohead_id=poitem_pohead_id)
+			WHERE pohead_id=<? value("pohead_id") ?>)
+<? endif ?>
+<? literal("charClause") ?>
 ORDER BY prj_number;
\ No newline at end of file