[Rt-commit] r4493 - in rtir/branches/1.9-EXPERIMENTAL: html/RTIR/Incident

[ruz at bestpractical.com]

Author: ruz
Date: Fri Feb  3 18:43:16 2006
New Revision: 4493

Modified:
   rtir/branches/1.9-EXPERIMENTAL/   (props changed)
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html

Log:
 r624 at cubic-pc:  cubic | 2006-02-03 16:11:37 +0300
 * hide allready linked tickets from collections


Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html	Fri Feb  3 18:43:16 2006
@@ -57,15 +57,16 @@
 my ($Type) = $m->comp('/RTIR/Elements/Type', Queue => $Queue);
 my $title = loc("Link selected [_1] to Incident #[_2]", $Type, $id);
 
-my $QueryString = "&".$m->comp('/Elements/QueryString',
+my $QueryString = $m->comp('/Elements/QueryString',
                                Query   => $Query,
                                Format  => $Format,
                                Rows    => $Rows,
                                OrderBy => $OrderBy,
                                Order   => $Order,
-                               Page    => $Page);
+                               Page    => $Page,
+                          );
 
-$BaseQuery = join ' AND ', map "( $_ )", $BaseQuery, "MemberOf IS NULL OR MemberOf != $id";
+$BaseQuery = join ' AND ', map "( $_ )", $BaseQuery, "MemberOf != $id";
 
 </%INIT>
 

Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html	Fri Feb  3 18:43:16 2006
@@ -69,6 +69,7 @@
 my $title = loc( "Link [_1] #[_2] to selected Incident", $Type, $id );
 
 my $BaseQuery = $m->comp( '/RTIR/Elements/BaseQuery', Queue => $Queue );
+$BaseQuery = join ' AND ', map "( $_ )", $BaseQuery, "HasMember != ". $ChildObj->id;
 
 my $current_tab = "RTIR/Incident/LinkToIncident.html?id=9"; #XXX: WTF id=9 does here?
 my $tab = $m->interp->apply_escapes($current_tab,'u');