Changeset 621

Timestamp:

07/04/14 13:18:11 (10 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Brown-paper-bag fix for patch in r620; forgot to include the SQL update,
forgot to include the new field in the column selection, and got the logic
sense for whether to show the "edit block" or "allocate free IP" link
inverted. *sigh*

Location:

branches/stable

Files:

• cgi-bin/ipdb.psql (modified) (1 diff)
• cgi-bin/search.cgi (modified) (3 diffs)
• templates/search/sresults.tmpl (modified) (1 diff)

branches/stable/cgi-bin/ipdb.psql

@@ -73 +73 @@
 );
 
-CREATE VIEW "searchme" as SELECT allocations.cidr, allocations.custid, allocations."type", allocations.city, allocations.description, allocations.notes, allocations.circuitid, allocations.vrf FROM allocations UNION SELECT poolips.ip, poolips.custid, poolips.type, poolips.city, poolips.description, poolips.notes, poolips.circuitid, poolips.vrf FROM poolips;
+CREATE VIEW "searchme" as SELECT allocations.cidr, allocations.custid, allocations."type", allocations.city, allocations.description, allocations.notes, allocations.circuitid, allocations.vrf, 'n' AS available FROM allocations UNION SELECT poolips.ip, poolips.custid, poolips.type, poolips.city, poolips.description, poolips.notes, poolips.circuitid, poolips.vrf, poolips.available FROM poolips;
 
 CREATE TABLE "alloctypes" (

branches/stable/cgi-bin/search.cgi

@@ -148 +148 @@
   # Columns actually returned.  Slightly better than hardcoding it
   # in each (sub)select
-  my $cols = "cidr,custid,type,city,description,vrf";
+  my $cols = "cidr,custid,type,city,description,vrf,available";
 
   # hack fix for undefined variables
@@ -351 +351 @@
 #    which probably shouldn't be for reasons of sanity.
 
-  my $cols = "cidr,custid,type,city,description,vrf";
+  my $cols = "cidr,custid,type,city,description,vrf,available";
 
   if ($category eq 'all') {
@@ -478 +478 @@
         desc => $desc,
         vrf => $vrf,
-        avail => $avail eq 'y',
+        avail => ($avail eq 'y' ? 1 : 0),
         );
     push @sresults, \%row;

branches/stable/templates/search/sresults.tmpl

@@ -17 +17 @@
 <TMPL_LOOP NAME=sresults>
 <tr class="row<TMPL_VAR NAME=rowclass>">
-<td><TMPL_IF issub>Sub </TMPL_IF><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?<TMPL_IF avail>action=edit&amp;block=<TMPL_VAR NAME=block><TMPL_ELSE>action=assign&block=<TMPL_VAR NAME=block>&fbtype=i</TMPL_IF>"><TMPL_VAR NAME=block></a><TMPL_IF ispool>&nbsp; <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR NAME=block>">List IPs</a></TMPL_IF></td>
+<td><TMPL_IF issub>Sub </TMPL_IF><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?<TMPL_IF avail>action=assign&block=<TMPL_VAR NAME=block>&fbtype=i<TMPL_ELSE>action=edit&amp;block=<TMPL_VAR NAME=block></TMPL_IF>"><TMPL_VAR NAME=block></a><TMPL_IF ispool>&nbsp; <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR NAME=block>">List IPs</a></TMPL_IF></td>
 <td><TMPL_VAR NAME=custid></td>
 <td><TMPL_VAR NAME=disptype></td>