merge NG auth, RT#21563

[freeside.git] / httemplate / view / svc_Common.html

diff --git a/httemplate/view/svc_Common.html b/httemplate/view/svc_Common.html
index defbee9..7e300b0 100644 (file)
--- a/httemplate/view/svc_Common.html
+++ b/httemplate/view/svc_Common.html
@@ -1,17 +1,18 @@
-<% include('elements/svc_Common.html',
+<& elements/svc_Common.html,
              'table'    => $table,
-            'edit_url' => $p."edit/svc_Common.html?svcdb=$table;svcnum=",
+            'edit_url' => $edit_url, #$p."edit/svc_Common.html?svcdb=$table;svcnum=",
             %opt,
-          )
-%>
+&>
 <%init>
 
 # false laziness w/edit/svc_Common.html
 
-$cgi->param('svcdb') =~ /^(svc_\w+)$/ or die "unparsable svcdb";
+$cgi->param('svcdb') =~ /^(svc_\w+)$/ or die "unparseable svcdb";
 my $table = $1;
 require "FS/$table.pm";
 
+my $edit_url = svc_url( 'm' => $m, 'action' => 'edit', 'svcdb' => $table, query => '' );
+
 my %opt;
 if ( UNIVERSAL::can("FS::$table", 'table_info') ) {
   $opt{'name'}   = "FS::$table"->table_info->{'name'};