Changeset 377 for trunk/dns.cgi

Timestamp:

08/09/12 16:36:01 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint adding locations to UI. See #10.

• Add location list sort field and order initialization to session setup
• Fix up a minor copy-paste oversight
• Fill in location update stubs
• Add missing logging and code-style bits to addLoc()

File:

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

trunk/dns.cgi

@@ -96 +96 @@
   $session->param('reclistsortby','host');
   $session->param('reclistorder','ASC');
+  $session->param('loclistsortby','description');
+  $session->param('loclistorder','ASC');
   $session->param('logsortby','stamp');
   $session->param('logorder','DESC');
@@ -1352 +1354 @@
 
     my $loc = getLoc($dbh, $webvar{loc});
-    $page->param(wastrying      => "adding");
+    $page->param(wastrying      => "editing");
     $page->param(todo           => "Edit location/view");
     $page->param(locact         => "update");
@@ -1363 +1365 @@
     changepage(page => "loclist", errmsg => "You are not permitted to edit locations/views", id => $webvar{parentid})
         unless ($permissions{admin} || $permissions{location_edit});
-##work
+
+    my ($code,$msg) = updateLoc($dbh, $webvar{id}, $curgroup, $webvar{locname}, $webvar{comments}, $webvar{iplist});
+
+    if ($code eq 'OK') {
+      changepage(page => "loclist", resultmsg => $msg);
+    } else {
+      $page->param(failed       => 1);
+      $page->param(errmsg       => $msg);
+      $page->param(wastrying    => "editing");
+      $page->param(todo         => "Edit location/view");
+      $page->param(locact       => "update");
+      $page->param(id           => $webvar{loc});
+      $page->param(locname      => $webvar{locname});
+      $page->param(comments     => $webvar{comments});
+      $page->param(iplist       => $webvar{iplist});
+    }
   } else {
     changepage(page => "loclist", errmsg => "You are not permitted to add locations/views", id => $webvar{parentid})
@@ -2169 +2186 @@
   # Some UI things need to be done to the list
   foreach my $l (@{$loclist}) {
+    $l->{iplist} = "(All IPs)" if !$l->{iplist};
     $l->{edloc} = ($permissions{admin} || $permissions{loc_edit});
     $l->{delloc} = ($permissions{admin} || $permissions{loc_delete});