Changeset 374 for trunk

Timestamp:

08/03/12 17:54:42 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint adding location/view UI bits. See #10.

• add location add/edit template
• stub out location add/edit, start filling in add section
• straighten out use of some of the new location-related permission flags

Location:

trunk

Files:

• dns.cgi (modified) (4 diffs)
• templates/location.tmpl (added)
• templates/loclist.tmpl (modified) (2 diffs)

trunk/dns.cgi

@@ -1344 +1344 @@
 } elsif ($webvar{page} eq 'loclist') {
 
-#  changepage(page => "domlist", errmsg => "You are not allowed access to this function")
-#       unless $permissions{admin} || $permissions{ foo? };
+  changepage(page => "domlist", errmsg => "You are not allowed access to this function")
+        unless $permissions{admin} || $permissions{location_view};
 
   # security check - does the user have permission to access this entity?
@@ -1354 +1354 @@
 
 # Permissions!
-  $page->param(addloc => $permissions{admin} || $permissions{loc_create});
-  $page->param(delloc => $permissions{admin} || $permissions{loc_delete});
+  $page->param(addloc => $permissions{admin} || $permissions{location_create});
+  $page->param(delloc => $permissions{admin} || $permissions{location_delete});
 
 } elsif ($webvar{page} eq 'location') {
 
+  changepage(page => "domlist", errmsg => "You are not allowed access to this function")
+        unless $permissions{admin} || $permissions{location_view};
+
+  # security check - does the user have permission to access this entity?
+#  if (!check_scope(id => $webvar{id}, type => 'loc')) {
+#    changepage(page => "loclist", errmsg => "You are not permitted to <foo> the requested location/view");
+#  }
+
+  if ($webvar{locact} eq 'new') {
+
+  } elsif ($webvar{locact} eq 'add') {
+    changepage(page => "loclist", errmsg => "You are not permitted to add locations/views", id => $webvar{parentid})
+        unless ($permissions{admin} || $permissions{location_create});
+
+##work
+    my ($code,$msg) = addLocation($dbh, $webvar{parentid}, $webvar{locname}, $webvar{iplist});
+
+    if ($code eq 'OK' || $code eq 'WARN') {
+      my %pageparams = (page => "loclist", id => $webvar{parentid},
+        defrec => $webvar{defrec}, revrec => $webvar{revrec});
+      $pageparams{warnmsg} = $msg."<br><br>\n".$DNSDB::resultstr if $code eq 'WARN';
+      $pageparams{resultmsg} = $DNSDB::resultstr if $code eq 'OK';
+      changepage(%pageparams);
+    } else {
+      $page->param(failed       => 1);
+      $page->param(errmsg       => $msg);
+      $page->param(wastrying    => "adding");
+      $page->param(todo         => "Add location/view");
+      $page->param(locact       => "add");
+      $page->param(parentid     => $webvar{parentid});
+      $page->param(id           => $webvar{id});
+      fill_recdata();   # populate the form... er, mostly.
+    }
+
+  } elsif ($webvar{locact} eq 'edit') {
+    changepage(page => "loclist", errmsg => "You are not permitted to edit locations/views", id => $webvar{parentid})
+        unless ($permissions{admin} || $permissions{location_edit});
+  } elsif ($webvar{locact} eq 'update') {
+    changepage(page => "loclist", errmsg => "You are not permitted to edit locations/views", id => $webvar{parentid})
+        unless ($permissions{admin} || $permissions{location_edit});
+  } else {
+    changepage(page => "loclist", errmsg => "You are not permitted to add locations/views", id => $webvar{parentid})
+        unless ($permissions{admin} || $permissions{location_create});
+
+    $page->param(todo => "Add location/view");
+    $page->param(locact => "add");
+    $page->param(parentid => $webvar{parentid});
+
+    $page->param(locname => ($webvar{locname} ? $webvar{locname} : ''));
+    $page->param(iplist => ($webvar{iplist} ? $webvar{iplist} : ''));
+  }
 
 } elsif ($webvar{page} eq 'dnsq') {
@@ -1594 +1645 @@
 
 ##common bits
+# mostly things in the menu
 if ($webvar{page} ne 'login' && $webvar{page} ne 'badpage') {
   $page->param(username => $session->param("username"));
@@ -1604 +1656 @@
 ##fixme
   $page->param(mayrdns => 1);
-  $page->param(mayloc => 1);
+
+  $page->param(mayloc => ($permissions{admin} || $permissions{loc_view}));
 
   $page->param(maydefrec => $permissions{admin});

trunk/templates/loclist.tmpl

@@ -23 +23 @@
 </tr>
 <TMPL_IF addloc>
-<tr><td colspan="3" align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=loc">New Location/View</a></td></tr>
+<tr><td colspan="3" align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=location">New Location/View</a></td></tr>
 </TMPL_IF>
 </table>
@@ -36 +36 @@
 <TMPL_LOOP name=loctable>
 <tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
-        <td align="left"><TMPL_IF edloc><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=location&amp;loc_action=edit&amp;loc=<TMPL_VAR NAME=location>"><TMPL_VAR NAME=description></a><TMPL_ELSE><TMPL_VAR NAME=description></TMPL_IF></td>
+        <td align="left"><TMPL_IF edloc><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=location&amp;locact=edit&amp;loc=<TMPL_VAR NAME=location>"><TMPL_VAR NAME=description></a><TMPL_ELSE><TMPL_VAR NAME=description></TMPL_IF></td>
         <td><TMPL_VAR name=iplist></td>
         <td><TMPL_VAR name=group_name></td>