Changeset 137

Timestamp:

10/07/11 15:59:35 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix record list filtering - standardize variable/form input name(s)
Use $filter global (since we so kindly define it while setting up
other session globals)
Note the filter behaviour in pgcount.tmpl; this makes it (somewhat)
more obvious that filtering has been applied to the record list.

Location:

trunk

Files:

• dns.cgi (modified) (3 diffs)
• templates/pgcount.tmpl (modified) (1 diff)
• templates/reclist.tmpl (modified) (1 diff)

trunk/dns.cgi

@@ -319 +319 @@
   $page->param(curpage => $webvar{page});
 
-  my $count = getRecCount($dbh, $webvar{defrec}, $webvar{id});
+  my $count = getRecCount($dbh, $webvar{defrec}, $webvar{id}, $filter);
 
   $sortby = 'host';
@@ -1397 +1397 @@
   $page->param(ttl      => $soa{ttl});
 
-  $startwith = $session->param($webvar{page}.'startwith');
-  $filter = $session->param($webvar{page}.'filter');
-
-  my $foo2 = getDomRecs($dbh,$def,$id,$perpage,$webvar{offset},$sortby,$sortorder);
+#  $startwith = $session->param($webvar{page}.'startwith');
+#  $filter = $session->param($webvar{page}.'filter');
+
+  my $foo2 = getDomRecs($dbh,$def,$id,$perpage,$webvar{offset},$sortby,$sortorder,$filter);
 
   my $row = 0;
@@ -1544 +1544 @@
   $page->param(pgtype => $pgtype);
   $page->param(parent => $parent);
+  $page->param(filter => $filter);
 } # end fill_pgcount()
 
 sub listdomains {
 
-  $startwith = $session->param($webvar{page}.'startwith');
-  $filter = $session->param($webvar{page}.'filter');
+#  $startwith = $session->param($webvar{page}.'startwith');
+#  $filter = $session->param($webvar{page}.'filter');
   $searchsubs = $session->param($webvar{page}.'searchsubs');
 

trunk/templates/pgcount.tmpl

@@ -1 @@
-<TMPL_IF ntot>Listing <TMPL_VAR NAME=nfirst> - <TMPL_VAR NAME=npglast> of <TMPL_VAR NAME=ntot><TMPL_ELSE>No <TMPL_VAR NAME=pgtype></TMPL_IF><TMPL_IF NAME=parent> in <TMPL_VAR NAME=parent></TMPL_IF>
+<TMPL_IF ntot>Listing <TMPL_VAR NAME=nfirst> - <TMPL_VAR NAME=npglast> of <TMPL_VAR NAME=ntot><TMPL_ELSE>No <TMPL_VAR NAME=pgtype></TMPL_IF><TMPL_IF NAME=parent> in <TMPL_VAR NAME=parent></TMPL_IF><TMPL_IF filter> matching "<TMPL_VAR NAME=filter>"</TMPL_IF>

trunk/templates/reclist.tmpl

@@ -33 +33 @@
                 <input type="hidden" name="id" value="<TMPL_VAR NAME=id>" />
                 <input type="hidden" name="defrec" value="<TMPL_VAR NAME=defrec>" />
-                <input name="search" />
+                <input name="filter"<TMPL_IF filter> value="<TMPL_VAR NAME=filter>"</TMPL_IF> />
                 <input type="submit" value="Filter" />
                 </fieldset>