Changeset 377 for trunk

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()

Location:

trunk

Files:

• DNSDB.pm (modified) (2 diffs)
• dns.cgi (modified) (4 diffs)

trunk/DNSDB.pm

@@ -2959 +2959 @@
     $dbh->do("INSERT INTO locations (location, group_id, iplist, description, comments) VALUES (?,?,?,?,?)", 
         undef, ($loc, $grp, $iplist, $shdesc, $comments) );
+    _log($dbh, entry => "Added location ($shdesc, '$iplist')");
+    $dbh->commit;
   };
   if ($@) {
@@ -2972 +2974 @@
 
   return ('OK',$loc);
-}
+} # end addLoc()
 
 
 ## DNSDB::updateLoc()
-sub updateLoc {}
+sub updateLoc {
+  my $dbh = shift;
+  my $loc = shift;
+  my $grp = shift;
+  my $shdesc = shift;
+  my $comments = shift;
+  my $iplist = shift;
+
+  $shdesc = '' if !$shdesc;
+  $comments = '' if !$comments;
+  $iplist = '' if !$iplist;
+
+  # Allow transactions, and raise an exception on errors so we can catch it later.
+  # Use local to make sure these get "reset" properly on exiting this block
+  local $dbh->{AutoCommit} = 0;
+  local $dbh->{RaiseError} = 1;
+
+  my $oldloc = getLoc($dbh, $loc);
+  my $okmsg = "Updated location (".$oldloc->{description}.", '".$oldloc->{iplist}."') to ($shdesc, '$iplist')";
+
+  eval {
+    $dbh->do("UPDATE locations SET group_id=?,iplist=?,description=?,comments=? WHERE location=?",
+        undef, ($grp, $iplist, $shdesc, $comments, $loc) );
+    _log($dbh, entry => $okmsg);
+    $dbh->commit;
+  };
+  if ($@) {
+    my $msg = $@;
+    eval { $dbh->rollback; };
+    if ($config{log_failures}) {
+      $shdesc = $loc if !$shdesc;
+      _log($dbh, (entry => "Failed updating location ($shdesc, '$iplist'): $msg"));
+      $dbh->commit;
+    }
+    return ('FAIL',$msg);
+  }
+
+  return ('OK',$okmsg);
+} # end updateLoc()
+
 
 ## DNSDB::delLoc()

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});