Changeset 313

Timestamp:

04/23/12 23:34:37 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Convert SQL for bulk change choice page to existing calls to
DNSDB.pm. See #1.

Location:

trunk

Files:

• dns.cgi (modified) (3 diffs)
• templates/bulkdomain.tmpl (modified) (1 diff)

trunk/dns.cgi

@@ -984 +984 @@
 } elsif ($webvar{page} eq 'bulkdomain') {
   # Bulk operations on domains.  Note all but group move are available on the domain list.
+##fixme:  do we care about bulk operations on revzones?  Move-to-group, activate, deactivate,
+# and delete should all be much rarer for revzones than for domains.
 
   changepage(page => "domlist", errmsg => "You are not permitted to make bulk domain changes")
@@ -990 +992 @@
   fill_grouplist("grouplist");
 
-##fixme
-##fixme  push the SQL and direct database fiddling off into a sub in DNSDB.pm
-##fixme
-
-  my $sth = $dbh->prepare("SELECT count(*) FROM domains WHERE group_id=?");
-  $sth->execute($curgroup);
-  my ($count) = ($sth->fetchrow_array);
+  my $count = getZoneCount($dbh, (revrec => 'n', curgroup => $curgroup) );
 
   $page->param(curpage => $webvar{page});
@@ -1003 +999 @@
   $page->param(perpage => $perpage);
 
-  my @domlist;
-  my $sql = "SELECT domain_id,domain FROM domains".
-        " WHERE group_id=?".
-        " ORDER BY domain".
-        ($offset eq 'all' ? '' : " LIMIT $perpage OFFSET ".$offset*$perpage);
-  $sth = $dbh->prepare($sql);
-  $sth->execute($curgroup);
+  my $domlist = getZoneList($dbh, (revrec => 'n', curgroup => $curgroup) );
   my $rownum = 0;
-  while (my @data = $sth->fetchrow_array) {
-    my %row;
-    $row{domid} = $data[0];
-    $row{domain} = $data[1];
-    $rownum++;  # putting this in the expression below causes failures.  *eyeroll*
-    $row{newrow} = $rownum % 5 == 0;
-    push @domlist, \%row;
-  }
-  $page->param(domtable => \@domlist);
+  foreach my $dom (@{$domlist}) {
+    delete $dom->{status};
+    delete $dom->{group};
+    $dom->{newrow} = (++$rownum) % 5 == 0;
+  }
+
+  $page->param(domtable => $domlist);
   # ACLs
   $page->param(maymove => ($permissions{admin} || ($permissions{domain_edit} && $permissions{domain_create} && $permissions{domain_delete})));

trunk/templates/bulkdomain.tmpl

@@ -40 +40 @@
 <table>
 <tr>
-<TMPL_LOOP NAME=domtable><td><input type="checkbox" name="dom_<TMPL_VAR NAME=domid>" value="<TMPL_VAR NAME=domid>" /> <TMPL_VAR NAME=domain></td>
+<TMPL_LOOP NAME=domtable><td><input type="checkbox" name="dom_<TMPL_VAR NAME=domainid>" value="<TMPL_VAR NAME=domainid>" /> <TMPL_VAR NAME=domain></td>
 <TMPL_IF newrow></tr>
 <tr>