Changeset 821

Timestamp:

03/16/16 13:33:11 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix bug generating the links in the index page with integrated master blocks

Location:

trunk

Files:

• cgi-bin/main.cgi (modified) (1 diff)
• templates/index2.tmpl (modified) (1 diff)

trunk/cgi-bin/main.cgi

@@ -349 +349 @@
         path => @templatepath);
     # alternate layout;  put master blocks on the front summary page instead of "out"/"down" a
-    # layer in the browse tree
-    my $vrfinfo = HTML::Template->new(filename => "showvrf.tmpl", path => @templatepath);
+    # layer in the browse tree.  Leaving the manual include of showvrf.tmpl for reference;  not
+    # sure why setting webpath here didn't seem to make it to the output.
+#    my $vrfinfo = HTML::Template->new(filename => "showvrf.tmpl", path => @templatepath);
     foreach my $vrf (@$vrflist) {
       my $masterlist = listSummary($ip_dbh, $vrf->{vrf});
-      $vrfinfo->param(vrf => $vrf->{vrf});
-      $vrfinfo->param(masterlist => $masterlist);
-      $vrfinfo->param(addmaster => ($IPDBacl{$authuser} =~ /s/) );
-      $vrfinfo->param(maydel => ($IPDBacl{$authuser} =~ /s/) );
-      $vrfinfo->param(sub => 1);
-      $vrf->{vrfinfo} = $vrfinfo->output;
+      $vrf->{masterlist} = $masterlist;
+      $vrf->{addmaster} = ($IPDBacl{$authuser} =~ /s/);
+      $vrf->{maydel} = ($IPDBacl{$authuser} =~ /s/);
+      $vrf->{sub} = 1;
+#      $vrfinfo->param(vrf => $vrf->{vrf});
+#      $vrfinfo->param(masterlist => $masterlist);
+#      $vrfinfo->param(addmaster => ($IPDBacl{$authuser} =~ /s/) );
+#      $vrfinfo->param(maydel => ($IPDBacl{$authuser} =~ /s/) );
+#      $vrfinfo->param(sub => 1);
+#      $vrfinfo->param(webpath => $IPDB::webpath);
+#      $vrf->{vrfinfo} = $vrfinfo->output;
     }
   }

trunk/templates/index2.tmpl

@@ -9 +9 @@
 </tr>
 <tr><td colspan="3">
-<TMPL_VAR NAME=vrfinfo>
+<TMPL_INCLUDE showvrf.tmpl>
 </td></tr>
 <tr><td colspan=3><br><hr class="w90"></td></tr>