From 2c757d7db4cb6a7b9655de13206fcc84fb7ce61f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 14 May 2006 16:47:31 +0000
Subject: first part of ACL and re-skinning work and some other small stuff

---
 httemplate/edit/part_virtual_field.cgi | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'httemplate/edit/part_virtual_field.cgi')

diff --git a/httemplate/edit/part_virtual_field.cgi b/httemplate/edit/part_virtual_field.cgi
index fb10321e8..7b2c768a7 100644
--- a/httemplate/edit/part_virtual_field.cgi
+++ b/httemplate/edit/part_virtual_field.cgi
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 my ($vfieldpart, $part_virtual_field);
 
@@ -21,12 +20,14 @@ if ( $cgi->param('error') ) {
 my $action = $part_virtual_field->vfieldpart ? 'Edit' : 'Add';
 
 my $p1 = popurl(1);
-print header("$action Virtual Field Definition", '');
 
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-%>
+%><%= include('/elements/header.html', "$action Virtual Field Definition") %>
+
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+  <BR><BR>
+<% } %>
+
 <FORM ACTION="<%=$p1%>process/generic.cgi" METHOD="POST">
 
 <INPUT TYPE="hidden" NAME="table" VALUE="part_virtual_field">
@@ -83,10 +84,8 @@ Field #<B><%=$vfieldpart or "(NEW)"%></B><BR><BR>
 
 </FORM>
 
-<BR><BR>
+<BR>
 <FONT SIZE=-2>If you don't understand what <I>check_block</I> and 
 <I>list_source</I> mean, <B>LEAVE THEM BLANK</B>.  We mean it.</FONT>
 
-
-</BODY>
-</HTML>
+<%= include('/elements/footer.html') %>
-- 
cgit v1.2.1


From 3ce7691203a7737406bf2d4442f7fd84b81f847e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 23 Aug 2006 22:25:39 +0000
Subject: Will things ever be the same again? It's the final masonize

---
 httemplate/edit/part_virtual_field.cgi | 115 ++++++++++++++++++---------------
 1 file changed, 63 insertions(+), 52 deletions(-)

(limited to 'httemplate/edit/part_virtual_field.cgi')

diff --git a/httemplate/edit/part_virtual_field.cgi b/httemplate/edit/part_virtual_field.cgi
index 7b2c768a7..c6564f5be 100644
--- a/httemplate/edit/part_virtual_field.cgi
+++ b/httemplate/edit/part_virtual_field.cgi
@@ -1,83 +1,94 @@
-<%
-my ($vfieldpart, $part_virtual_field);
+%
+%my ($vfieldpart, $part_virtual_field);
+%
+%if ( $cgi->param('error') ) {
+%  $part_virtual_field = new FS::part_virtual_field ( {
+%    map { $_, scalar($cgi->param($_)) } fields('part_virtual_field')});
+%  $vfieldpart = $part_virtual_field->vfieldpart;
+%} else {
+%  my($query) = $cgi->keywords;
+%  if ( $query =~ /^(\d+)$/ ) { #editing
+%    $vfieldpart=$1;
+%    $part_virtual_field=qsearchs('part_virtual_field',
+%        {'vfieldpart' => $vfieldpart})
+%      or die "Unknown vfieldpart!";
+%  
+%  } else { #adding
+%    $part_virtual_field = new FS::part_virtual_field({});
+%  }
+%}
+%my $action = $part_virtual_field->vfieldpart ? 'Edit' : 'Add';
+%
+%my $p1 = popurl(1);
+%
+%
+<% include('/elements/header.html', "$action Virtual Field Definition") %>
+% if ( $cgi->param('error') ) { 
 
-if ( $cgi->param('error') ) {
-  $part_virtual_field = new FS::part_virtual_field ( {
-    map { $_, scalar($cgi->param($_)) } fields('part_virtual_field')});
-  $vfieldpart = $part_virtual_field->vfieldpart;
-} else {
-  my($query) = $cgi->keywords;
-  if ( $query =~ /^(\d+)$/ ) { #editing
-    $vfieldpart=$1;
-    $part_virtual_field=qsearchs('part_virtual_field',
-        {'vfieldpart' => $vfieldpart})
-      or die "Unknown vfieldpart!";
-  
-  } else { #adding
-    $part_virtual_field = new FS::part_virtual_field({});
-  }
-}
-my $action = $part_virtual_field->vfieldpart ? 'Edit' : 'Add';
-
-my $p1 = popurl(1);
-
-%><%= include('/elements/header.html', "$action Virtual Field Definition") %>
-
-<% if ( $cgi->param('error') ) { %>
-  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <% $cgi->param('error') %></FONT>
   <BR><BR>
-<% } %>
+% } 
+
 
-<FORM ACTION="<%=$p1%>process/generic.cgi" METHOD="POST">
+<FORM ACTION="<%$p1%>process/generic.cgi" METHOD="POST">
 
 <INPUT TYPE="hidden" NAME="table" VALUE="part_virtual_field">
 <INPUT TYPE="hidden" NAME="redirect_ok" 
-    VALUE="<%=popurl(2)%>browse/part_virtual_field.cgi">
-<INPUT TYPE="hidden" NAME="vfieldpart" VALUE="<%=
+    VALUE="<%popurl(2)%>browse/part_virtual_field.cgi">
+<INPUT TYPE="hidden" NAME="vfieldpart" VALUE="<%
   $vfieldpart%>">
-Field #<B><%=$vfieldpart or "(NEW)"%></B><BR><BR>
+Field #<B><%$vfieldpart or "(NEW)"%></B><BR><BR>
 
-<%=ntable("#cccccc",2)%>
+<%ntable("#cccccc",2)%>
   <TR>
     <TD ALIGN="right">Name</TD>
-    <TD><INPUT TYPE="text" NAME="name" MAXLENGTH=15 VALUE="<%=
+    <TD><INPUT TYPE="text" NAME="name" MAXLENGTH=15 VALUE="<%
     $part_virtual_field->name%>"></TD>
   </TR>
   <TR>
     <TD ALIGN="right">Table</TD>
-    <TD><% if ($action eq 'Add') { %>
-      <SELECT SIZE=1 NAME="dbtable"><%
-        my $dbdef = dbdef;  # ick
-        foreach my $dbtable (sort { $a cmp $b } $dbdef->tables) {
-          if ($dbtable !~ /^h_/
-          and $dbdef->table($dbtable)->primary_key) { %>
-            <OPTION VALUE="<%=$dbtable%>"><%=$dbtable%></OPTION><%
-          }
-        }
-      %></SELECT><%
-    } else { # Edit
-    %><%=$part_virtual_field->dbtable%>
-    <INPUT TYPE="hidden" NAME="dbtable" VALUE="<%=$part_virtual_field->dbtable%>">
- <% } %>
+    <TD>
+% if ($action eq 'Add') { 
+
+      <SELECT SIZE=1 NAME="dbtable">
+%
+%        my $dbdef = dbdef;  # ick
+%        foreach my $dbtable (sort { $a cmp $b } $dbdef->tables) {
+%          if ($dbtable !~ /^h_/
+%          and $dbdef->table($dbtable)->primary_key) { 
+
+            <OPTION VALUE="<%$dbtable%>"><%$dbtable%></OPTION>
+%
+%          }
+%        }
+%      
+</SELECT>
+%
+%    } else { # Edit
+%    
+<%$part_virtual_field->dbtable%>
+    <INPUT TYPE="hidden" NAME="dbtable" VALUE="<%$part_virtual_field->dbtable%>">
+% } 
+
     </TD>
   <TR>
     <TD ALIGN="right">Label</TD>
-    <TD><INPUT TYPE="text" NAME="label" MAXLENGTH="20" VALUE="<%=
+    <TD><INPUT TYPE="text" NAME="label" MAXLENGTH="20" VALUE="<%
     $part_virtual_field->label%>"></TD>
   </TR>
   <TR>
     <TD ALIGN="right">Length</TD>
-    <TD><INPUT TYPE="text" NAME="length" MAXLENGTH=4 VALUE="<%=
+    <TD><INPUT TYPE="text" NAME="length" MAXLENGTH=4 VALUE="<%
     $part_virtual_field->length%>"></TD>
   </TR>
   <TR>
     <TD ALIGN="right">Check</TD>
-    <TD><TEXTAREA COLS="20" ROWS="4" NAME="check_block"><%=
+    <TD><TEXTAREA COLS="20" ROWS="4" NAME="check_block"><%
     $part_virtual_field->check_block%></TEXTAREA></TD>
   </TR>
   <TR>
     <TD ALIGN="right">List source</TD>
-    <TD><TEXTAREA COLS="20" ROWS="4" NAME="list_source"><%=
+    <TD><TEXTAREA COLS="20" ROWS="4" NAME="list_source"><%
     $part_virtual_field->list_source%></TEXTAREA></TD>
   </TR>
 </TABLE><BR><INPUT TYPE="submit" VALUE="Submit">
@@ -88,4 +99,4 @@ Field #<B><%=$vfieldpart or "(NEW)"%></B><BR><BR>
 <FONT SIZE=-2>If you don't understand what <I>check_block</I> and 
 <I>list_source</I> mean, <B>LEAVE THEM BLANK</B>.  We mean it.</FONT>
 
-<%= include('/elements/footer.html') %>
+<% include('/elements/footer.html') %>
-- 
cgit v1.2.1


From 35154452fe5ad96338e79f984236d265e1cbbbdf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 14 Sep 2006 19:33:48 +0000
Subject: don't promise virtual fields on tables we can't deliver them on. 
 virtual fields suck anyway, they should be real database fields

---
 httemplate/edit/part_virtual_field.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit/part_virtual_field.cgi')

diff --git a/httemplate/edit/part_virtual_field.cgi b/httemplate/edit/part_virtual_field.cgi
index c6564f5be..9dda4ebf9 100644
--- a/httemplate/edit/part_virtual_field.cgi
+++ b/httemplate/edit/part_virtual_field.cgi
@@ -53,7 +53,8 @@ Field #<B><%$vfieldpart or "(NEW)"%></B><BR><BR>
       <SELECT SIZE=1 NAME="dbtable">
 %
 %        my $dbdef = dbdef;  # ick
-%        foreach my $dbtable (sort { $a cmp $b } $dbdef->tables) {
+%        #foreach my $dbtable (sort { $a cmp $b } $dbdef->tables) {
+%        foreach my $dbtable (qw( svc_broadband )) {
 %          if ($dbtable !~ /^h_/
 %          and $dbdef->table($dbtable)->primary_key) { 
 
-- 
cgit v1.2.1