Changeset 185

Timestamp:

12/06/11 13:00:11 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix isParent() to return correct results for checks where the
checked parent is not the immediate parent of the checked child.
This triggered a UI glitch where the group tree was not properly
expanded to the current group if a sub-sub-sub group of the
login group was set as the current group.

Clean up stale comments in fill_grptree

Location:

trunk

Files:

• DNSDB.pm (modified) (1 diff)
• dns.cgi (modified) (1 diff)

trunk/DNSDB.pm

@@ -1520 +1520 @@
 ##fixme: do we care about trying to return a "no such record/domain/user/group" error?
       warn $dbh->errstr." $sql, $id" if $dbh->errstr;
-      last;
     }
     # group 1 is its own parent.  need this here more to break strange loops than for detecting a parent

trunk/dns.cgi

@@ -1604 +1604 @@
     $row{grpnum} = $_;
     $row{whereami} = $uri_self;
-        # for all that HTML::Template is supposed to keep the HTML out of the Perl, this is so much more compact...
-#    $row{grpdisp} = ($_ == $cur ? "<b>$row{grpname}</b>" : $row{grpname});
-$row{curgrp} = ($_ == $cur);
-$row{expanded} = isParent($dbh, $_, 'group', $cur, 'group');
-$row{expanded} = 1 if $_ == $cur;
+    $row{curgrp} = ($_ == $cur);
+    $row{expanded} = isParent($dbh, $_, 'group', $cur, 'group');
+    $row{expanded} = 1 if $_ == $cur;
     $row{subs} = fill_grptree($_,$cur,$indent.'    ');
     $row{indent} = $indent;