Changeset 43 for trunk

Timestamp:

12/09/09 17:08:46 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix grouplist brokenness in menu (first entry was being set to current group

instead of login group)
-> may be a way to compress that further

Compact and generalize process of filling table headings for lists - users,

domains, groups; records should be able to use this too

Location:

trunk

Files:

• dns.cgi (modified) (4 diffs)
• templates/grpman.tmpl (modified) (1 diff)
• templates/menu.tmpl (modified) (1 diff)

trunk/dns.cgi

@@ -651 +651 @@
   $page->param(group => $curgroup);
   $page->param(groupname => groupName($dbh,$curgroup));
+  $page->param(logingrp => groupName($dbh,$logingroup));
 
   # group tree.  should go elsewhere, probably
@@ -1044 +1045 @@
 my @cols = ('group','parent','nusers','ndomains');
 
+my %colnames = (group => 'Group', parent => 'Parent Group', nusers => 'Users', ndomains => 'Domains');
+
+fill_colheads(\@cols, \%colnames);
+
+if (0) {
 my @headings;
 
   $sortorder = $webvar{sortorder} if $webvar{sortorder};
-foreach my $colhead (@cols) {
+foreach my $col (@cols) {
   my %coldata;
-  $coldata{firstcol} = 1 if $colhead eq $cols[0];
+  $coldata{firstcol} = 1 if $col eq $cols[0];
   $coldata{sid} = $sid;
   $coldata{page} = $webvar{page};
   $coldata{offset} = $webvar{offset} if $webvar{offset};
-  $coldata{sortby} = $colhead;
-  if ($colhead eq $sortby) {
-push @debugbits, "$colhead $sortby $sortorder<br>\n";
+  $coldata{sortby} = $col;
+  $coldata{colname} = $colnames{$col};
+  if ($col eq $sortby) {
     $coldata{order} = ($sortorder eq 'ASC' ? 'DESC' : 'ASC');
     $coldata{sortorder} = $sortorder;
@@ -1065 +1071 @@
 
 $page->param(colheads => \@headings);
+
+} # temp
 
   my @grouplist;
@@ -1157 +1165 @@
   $page->param(usertable => \@userlist);
 }
+
+# Generate all of the glop necessary to add or not the appropriate marker/flag for
+# the sort order and column in domain, user, group, and record lists
+# Takes an array ref and hash ref
+sub fill_colheads {
+  my $cols = shift;
+  my $colnames = shift;
+
+  my @headings;
+
+  foreach my $col (@$cols) {
+    my %coldata;
+    $coldata{firstcol} = 1 if $col eq $cols->[0];
+    $coldata{sid} = $sid;
+    $coldata{page} = $webvar{page};
+    $coldata{offset} = $webvar{offset} if $webvar{offset};
+    $coldata{sortby} = $col;
+    $coldata{colname} = $colnames->{$col};
+    if ($col eq $sortby) {
+      $coldata{order} = ($sortorder eq 'ASC' ? 'DESC' : 'ASC');
+      $coldata{sortorder} = $sortorder;
+    } else {
+      $coldata{order} = 'ASC';
+    }
+    push @headings, \%coldata;
+  }
+
+  $page->param(colheads => \@headings);
+
+} # end gentableheadings

trunk/templates/grpman.tmpl

@@ -46 +46 @@
 NAME=sid>&amp;page=<TMPL_VAR NAME=page><TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR 
 NAME=offset></TMPL_IF>&amp;sortby=<TMPL_VAR NAME=sortby>&amp;order=<TMPL_VAR NAME=order>"><TMPL_VAR 
-NAME=colname><TMPL_VAR NAME=sortby></a><TMPL_IF NAME=sortorder>&nbsp;<img alt="<TMPL_VAR NAME=sortorder>" 
+NAME=colname></a><TMPL_IF NAME=sortorder>&nbsp;<img alt="<TMPL_VAR NAME=sortorder>" 
 src="images/<TMPL_VAR NAME=sortorder>.png" /></TMPL_IF></td>
 </TMPL_LOOP>

trunk/templates/menu.tmpl

@@ -22 +22 @@
 <hr />
 <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=grpman">Manage groups</a><br />
-<div id="grptree"><ul><TMPL_IF inlogingrp><b><TMPL_VAR NAME=groupname></b><TMPL_ELSE><TMPL_VAR NAME=groupname></TMPL_IF><TMPL_VAR NAME=grptree></ul></div>
+<div id="grptree">
+<ul>
+<li><TMPL_IF inlogingrp><b><TMPL_VAR NAME=logingrp></b><TMPL_ELSE><TMPL_VAR NAME=logingrp></TMPL_IF>
+<TMPL_VAR NAME=grptree>
+</li>
+</ul>
+</div>
 <!-- hmm:  <TMPL_VAR NAME=groupname> -->
 <hr />