Changeset 327

Timestamp:

05/02/12 18:19:57 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Rewrite fill_grouplist() sub to not do direct SQL calls. Steal
the algorithm from fill_grouptree and adapt to present an
indented, grouped-by-parent list of groups. See #1.

Tweak getChildren() to sort its results for more consistent behaviours;
may add a flag later to choose the sort field

File:

• trunk/dns.cgi (modified) (1 diff)

trunk/dns.cgi

@@ -2003 +2003 @@
   my $cur = shift || $curgroup;
 
-  my @childgroups;
-  getChildren($dbh, $logingroup, \@childgroups, 'all');
-  my $childlist = join(',',@childgroups);
-
-##fixme:  need to reorder list so that we can display a pseudotree in group dropdowns
-
-  # weesa gonna discard parent_group_id for now
-  my $sth = $dbh->prepare("SELECT group_id,parent_group_id,group_name FROM groups ".
-        "WHERE group_id IN ($logingroup".($childlist ? ",$childlist" : '').")".
-        "ORDER BY group_id");
-  $sth->execute;
+  # little recursive utility sub-sub
+  sub getgroupdrop {
+    my $root = shift;
+    my $cur = shift;    # to tag the selected group
+    my $grplist = shift;
+    my $indent = shift || '    ';
+
+    my @childlist;
+    getChildren($dbh,$root,\@childlist,'immediate');
+    return if $#childlist == -1;
+    foreach (@childlist) {
+      my %row;
+      $row{groupval} = $_;
+      $row{groupactive} = ($_ == $cur);
+      $row{groupname} = $indent.groupName($dbh, $_);
+      push @{$grplist}, \%row;
+      getgroupdrop($_, $cur, $grplist, $indent.'    ');
+    }
+  }
+
   my @grouplist;
-  while (my ($groupid,$pargroup,$groupname) = $sth->fetchrow_array()) {
-    my %row;
-    $row{groupname} = $groupname;
-    $row{groupval} = $groupid;
-##fixme: need magic
-## ... WTF?
-#    $row{defgroup} = '';
-    $row{groupactive} = 1 if $groupid == $cur;
-    push @grouplist, \%row;
-  }
+  push @grouplist, { groupval => $logingroup, groupactive => $logingroup == $curgroup,
+        groupname => groupName($dbh, $logingroup) };
+  getgroupdrop($logingroup, $curgroup, \@grouplist);
 
   $page->param("$template_var" => \@grouplist);
-
 } # end fill_grouplist()