Changeset 54 for trunk

Timestamp:

12/29/09 13:06:01 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

Pronouncing starts with, search/show subgroups, and filter/search "sufficiently

complete"

• moved state for all three into per-page session variables
• deliberately leaving offset out of this set as "offset==all" could theoretically produce a very long page

Fixed buglet in first display of user list where no column was apparently

being used to sort

Explicitly pass sortby and sortorder to fill_colheads rather than relying on

magic globals (lots of this left to do)

Fixed group list to actually show subgroups in the current group, not just the

current group, by default (regression introduced <n> revisions ago, don't care
to track down the specifics

File:

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

trunk/dns.cgi

@@ -52 +52 @@
   $session->param('domlistsortby','domain');
   $session->param('domlistorder','ASC');
-  $session->param('useradminsortby','username');
+  $session->param('useradminsortby','user');
   $session->param('useradminorder','ASC');
   $session->param('grpmansortby','group');
@@ -67 +67 @@
 my $group = ($webvar{group} ? $webvar{group} : 1);
 
+# per-page startwith, filter, searchsubs
+$session->param($webvar{page}.'startwith', $webvar{startwith}) if $webvar{startwith};
+$session->param($webvar{page}.'filter', $webvar{filter}) if $webvar{filter};
+$webvar{searchsubs} =~ s/^n ?// if $webvar{searchsubs};
+$session->param($webvar{page}.'searchsubs', $webvar{searchsubs}) if $webvar{searchsubs};
+
+my $startwith = $session->param($webvar{page}.'startwith');
+my $filter = $session->param($webvar{page}.'filter');
+my $searchsubs = $session->param($webvar{page}.'searchsubs');
+
+
+
+if (0) {
 # filter, starts with, search subgroups
 $session->param('filter', "$webvar{page}:filter$webvar{filter}") if defined($webvar{filter});
@@ -80 +93 @@
 my $searchsubs = $session->param('searchsubs');
 $searchsubs = ($searchsubs =~ /^$webvar{page}:searchsubs(.+)$/ ? $1 : '');
+}
+
+
 
 # nrgh, can't handle login here because we don't have a database handle to check the user/pass with yet
@@ -1022 +1038 @@
   my @cols = ('domain', 'status', 'group');
   my %colheads = (domain => 'Domain', status => 'Status', group => 'Group');
-  fill_colheads(\@cols, \%colheads);
+  fill_colheads($sortby, $sortorder, \@cols, \%colheads);
 
 #  $page->param(sortorder => $sortorder);
@@ -1076 +1092 @@
   my $childlist = join(',',@childgroups);
 
-  my $sql = "SELECT count(*) FROM groups WHERE group_id IN ($logingroup".($childlist ? ",$childlist" : '').")".
+  my $sql = "SELECT count(*) FROM groups WHERE parent_group_id IN ($logingroup".($childlist ? ",$childlist" : '').")".
         ($startwith ? " AND group_name ~* '^[$startwith]'" : '').
         ($filter ? " AND group_name ~* '$filter'" : '');
@@ -1099 +1115 @@
   my @cols = ('group','parent','nusers','ndomains');
   my %colnames = (group => 'Group', parent => 'Parent Group', nusers => 'Users', ndomains => 'Domains');
-  fill_colheads(\@cols, \%colnames);
+  fill_colheads($sortby, $sortorder, \@cols, \%colnames);
 
 # waffle, waffle - keep state on these as well as sortby, sortorder?
@@ -1118 +1134 @@
         "LEFT OUTER JOIN users u ON u.group_id=g.group_id ".
         "LEFT OUTER JOIN domains d ON d.group_id=g.group_id ".
-        "WHERE g.group_id IN ($logingroup".($childlist ? ",$childlist" : '').") ".
+        "WHERE g.parent_group_id IN ($logingroup".($childlist ? ",$childlist" : '').") ".
 ##fixme:  don't do variable subs in SQL, use placeholders and params in ->execute()
         ($startwith ? " AND g.group_name ~* '^[$startwith]'" : '').
@@ -1201 +1217 @@
   my @cols = ('user','fname','type','group','status');
   my %colnames = (user => 'Username', fname => 'Full Name', type => 'Type', group => 'Group', status => 'Status');
-  fill_colheads(\@cols, \%colnames);
+  fill_colheads($sortby, $sortorder, \@cols, \%colnames);
 
 # waffle, waffle - keep state on these as well as sortby, sortorder?
@@ -1250 +1266 @@
 # Takes an array ref and hash ref
 sub fill_colheads {
+  my $sortby = shift;
+  my $sortorder = shift;
   my $cols = shift;
   my $colnames = shift;
@@ -1274 +1292 @@
   $page->param(colheads => \@headings);
 
-} # end gentableheadings
+} # end fill_colheads()