Changeset 533 for trunk

Timestamp:

10/18/13 17:26:11 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix up poor edge-case handling of pagination offsets when changing groups or
filter options. Fix pagination on bulk domain page.
Required:

• reordering pagination/offset/filter munging to/from %webvar and session yet again
• re-adding the offset if we're on a live record list page
• fix call to $dnsdb->getDomList() for bulk changes (offset missing completely)
• explicitly fork $uri_self for group tree, and explicitly trim offset
• remove old code that only handled a limited subset of cases (letter filter and search)
• fix call to $dnsdb->getDomList() in listzones() to use the global $offset instead of blindly obeying whatever might be left over in $webvar{offset}

File:

• trunk/dns.cgi (modified) (9 diffs)

trunk/dns.cgi

@@ -131 +131 @@
 $webvar{searchsubs} =~ s/[^yn]//g if $webvar{searchsubs};
 
-$session->param($webvar{page}.'startwith', $webvar{startwith}) if defined($webvar{startwith});
-$session->param($webvar{page}.'filter', $webvar{filter}) if defined($webvar{filter});
+# pagination
+my $perpage = 15;  # Just In Case
+$perpage = $dnsdb->{perpage} if $dnsdb->{perpage};
+my $offset = ($webvar{offset} ? $webvar{offset} : 0);
+
+## set up "URL to self" (whereami edition)
+# @#$%@%@#% XHTML - & in a URL must be escaped.  >:(
+my $uri_self = $ENV{REQUEST_URI};
+$uri_self =~ s/\&([a-z])/\&amp\;$1/g;
+
+# le sigh.  and we need to strip any previous action
+$uri_self =~ s/\&action=[^&]+//g;
+
+# much magic happens.  if startwith or a search string change (to, from, or
+# across, in the request vs whatever's in the session) then the offset should
+# be reset to 0 so that the first/prev/next/last widget populates correctly,
+# and so that the list of whatever we're looking at actually shows things
+# (since we may have started on page 42 of 300 with a LOOOOONG list, but we
+# now only need 3 pages for the filtered list).
+# while we're at it, plonk these into the session for safekeeping.
+if (defined($webvar{startwith})) {
+  if ($webvar{startwith} ne $session->param($webvar{page}.'startwith')) {
+    $uri_self =~ s/\&offset=[^&]//;
+    $offset = 0;
+  }
+  $session->param($webvar{page}.'startwith', $webvar{startwith});
+}
+if (defined($webvar{filter})) {
+  if ($webvar{filter} ne $session->param($webvar{page}.'filter')) {
+    $uri_self =~ s/\&offset=[^&]//;
+    $offset = 0;
+  }
+  $session->param($webvar{page}.'filter', $webvar{filter})
+}
 $session->param($webvar{page}.'searchsubs', $webvar{searchsubs}) if defined($webvar{searchsubs});
 
+# and now that the search/filter criteria for this page are set, put them in some globals for actual use.
 my $startwith = $session->param($webvar{page}.'startwith');
 my $filter = $session->param($webvar{page}.'filter');
@@ -143 +176 @@
 push @filterargs, "^[$startwith]" if $startwith;
 push @filterargs, $filter if $filter;
-
-## set up "URL to self" (whereami edition)
-# @#$%@%@#% XHTML - & in a URL must be escaped.  >:(
-my $uri_self = $ENV{REQUEST_URI};
-$uri_self =~ s/\&([a-z])/\&amp\;$1/g;
-
-# le sigh.  and we need to strip any previous action
-$uri_self =~ s/\&action=[^&]+//g;
 
 # and search filter options.  these get stored in the session, but discarded
@@ -166 +191 @@
 
 ## end uri_self monkeying
-
-# pagination
-my $perpage = 15;  # Just In Case
-$perpage = $dnsdb->{perpage} if $dnsdb->{perpage};
-my $offset = ($webvar{offset} ? $webvar{offset} : 0);
 
 # NB:  these must match the field name and SQL ascend/descend syntax respectively
@@ -314 +334 @@
       changepage(%args);
     }
-
-  }
+    # add offset back *into* $uri_self if we're also currently looking at a live record list.
+    if ($webvar{page} eq 'reclist' && $webvar{defrec} eq 'n') {
+      $uri_self .= "\&offset=$offset";
+    }
+  } # done action=chgroup
 } # handle global webvar{action}s
 
@@ -1059 +1082 @@
   $page->param(perpage => $perpage);
 
-  my $domlist = $dnsdb->getZoneList(revrec => 'n', curgroup => $curgroup);
+  my $domlist = $dnsdb->getZoneList(revrec => 'n', curgroup => $curgroup, offset => $offset);
   my $rownum = 0;
   foreach my $dom (@{$domlist}) {
@@ -1828 +1851 @@
   my @childlist;
 
+  # some magic to control bad offsets on group change
+  my $grp_uri_self = $uri_self;
+  $grp_uri_self =~ s/\&offset=[^&]+// unless ($webvar{page} eq 'reclist' && $webvar{defrec} eq 'n');
+
   my $grptree = HTML::Template->new(filename => 'templates/grptree.tmpl');
   $dnsdb->getChildren($root, \@childlist, 'immediate');
@@ -1836 +1863 @@
     $row{grpname} = $dnsdb->groupName($_);
     $row{grpnum} = $_;
-    $row{whereami} = $uri_self;
+    $row{whereami} = $grp_uri_self;
     $row{curgrp} = ($_ == $cur);
     $row{expanded} = $dnsdb->isParent($_, 'group', $cur, 'group');
@@ -2066 +2093 @@
   my $parent = shift;
 
-  # Fix display/UI bug where if you are not on the first page of the list, and
-  # you add a search term or click one of the "starts with" links, you end up
-  # on a page showing nothing.
-  # For bonus points, this reverts to the original offset on clicking the "All" link (mostly)
-  if ($offset ne 'all') {
-    $offset-- while ($offset * $perpage) >= $pgcount;
-  }
-
   $page->param(ntot => $pgcount);
   $page->param(nfirst => (($offset eq 'all' ? 0 : $offset)*$perpage+1));
@@ -2132 +2151 @@
   my $zonelist = $dnsdb->getZoneList(childlist => $childlist, curgroup => $curgroup, revrec => $webvar{revrec},
         filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef),
-        offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder
+        offset => $offset, sortby => $sortby, sortorder => $sortorder
         );
 # probably don't need this, keeping for reference for now