Changeset 383 for trunk/dns.cgi

Timestamp:

08/13/12 17:26:35 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint adding location support to UI. See #10.

• Add location entries to new domain, record list, and record add/edit templates
• Add UI sub to fill location dropdown on new domain and record add/edit templates
• Fix thinko in initial setting of location_view permission
• Handle display properly if user does not have location_view permission
• Add DB-interfacing subs in DNSDB.pm to get the default location set on a zone, and to return a list of locations suitable for a UI dropdown

File:

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

trunk/dns.cgi

@@ -346 +346 @@
   $webvar{group} = $curgroup if !$webvar{group};
   fill_grouplist("grouplist", $webvar{group});
+  fill_loclist();
 
   if ($session->param('add_failed')) {
@@ -630 +631 @@
 
     fill_recdata();
+
+    if ($webvar{defrec} eq 'n') {
+      my $defloc = getZoneLocation($dbh, $webvar{revrec}, $webvar{parentid});
+      fill_loclist($curgroup, $defloc);
+    }
 
   } elsif ($webvar{recact} eq 'add') {
@@ -663 +669 @@
       $page->param(id           => $webvar{id});
       fill_recdata();   # populate the form... er, mostly.
+      if ($webvar{defrec} eq 'n') {
+        fill_loclist($curgroup, $webvar{location});
+      }
     }
 
@@ -682 +691 @@
     $page->param(ttl            => $recdata->{ttl});
     $page->param(typelist       => getTypelist($dbh, $webvar{revrec}, $recdata->{type}));
+
+    if ($webvar{defrec} eq 'n') {
+      fill_loclist($curgroup, $recdata->{location});
+    }
 
   } elsif ($webvar{recact} eq 'update') {
@@ -1638 +1651 @@
   $page->param(mayrdns => 1);
 
-  $page->param(mayloc => ($permissions{admin} || $permissions{loc_view}));
+  $page->param(mayloc => ($permissions{admin} || $permissions{location_view}));
 
   $page->param(maydefrec => $permissions{admin});
@@ -1848 +1861 @@
     $rec->{record_edit} = ($permissions{admin} || $permissions{record_edit});
     $rec->{record_delete} = ($permissions{admin} || $permissions{record_delete});
+    $rec->{locname} = '' unless ($permissions{admin} || $permissions{location_view});
   }
   $page->param(reclist => $foo2);
@@ -2101 +2115 @@
 
 
+sub fill_loclist {
+  my $cur = shift || $curgroup;
+  my $defloc = shift || '';
+
+  return unless ($permissions{admin} || $permissions{location_view});
+
+  my $loclist = getLocDropdown($dbh, $cur, $defloc);
+
+  $page->param(location_view => ($permissions{admin} || $permissions{location_view}));
+  $page->param(loclist => $loclist);
+} # end fill_loclist()
+
+
 sub list_users {