Changeset 64 for trunk


Ignore:
Timestamp:
10/25/10 16:49:10 (14 years ago)
Author:
Kris Deugau
Message:

/trunk

Fix up buglet in search filtering by start letter; 0-9 did not display properly.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/dns.cgi

    r63 r64  
    6868
    6969# per-page startwith, filter, searchsubs
    70 $session->param($webvar{page}.'startwith', $webvar{startwith}) if $webvar{startwith};
     70$session->param($webvar{page}.'startwith', $webvar{startwith}) if defined($webvar{startwith});
    7171$session->param($webvar{page}.'filter', $webvar{filter}) if defined($webvar{filter});
    7272$webvar{searchsubs} =~ s/^n ?// if $webvar{searchsubs};
    … …  
    11461146
    11471147# waffle, waffle - keep state on these as well as sortby, sortorder?
    1148   $page->param("start$webvar{startwith}" => 1) if $webvar{startwith} && $webvar{startwith} =~ /^[a-z]$/;
     1148  $page->param("start$startwith" => 1) if $startwith && $startwith =~ /^(?:[a-z]|0-9)$/;
    11491149
    11501150  $page->param(filter => $filter) if $filter;
    … …  
    12461246
    12471247# waffle, waffle - keep state on these as well as sortby, sortorder?
    1248   $page->param("start$startwith" => 1) if $startwith && $startwith =~ /^[a-z]$/;
     1248  $page->param("start$startwith" => 1) if $startwith && $startwith =~ /^(?:[a-z]|0-9)$/;
    12491249
    12501250  $page->param(filter => $filter) if $filter;

  • trunk/templates/lettsearch.tmpl

    r53 r64  
    11<a href="<TMPL_VAR NAME=whereami>&amp;startwith=">All</a> |
    2 <TMPL_UNLESS startnum><a href="<TMPL_VAR NAME=whereami>&amp;startwith=0-9">0-9</a><TMPL_ELSE><b>0-9</b></TMPL_UNLESS> |
     2<TMPL_UNLESS start0-9><a href="<TMPL_VAR NAME=whereami>&amp;startwith=0-9">0-9</a><TMPL_ELSE><b>0-9</b></TMPL_UNLESS> |
    33<TMPL_UNLESS starta><a href="<TMPL_VAR NAME=whereami>&amp;startwith=a">A</a><TMPL_ELSE><b>A</b></TMPL_UNLESS> |
    44<TMPL_UNLESS startb><a href="<TMPL_VAR NAME=whereami>&amp;startwith=b">B</a><TMPL_ELSE><b>B</b></TMPL_UNLESS> |
Note: See TracChangeset for help on using the changeset viewer.