projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
httemplate
/
view
/
svc_Common.html
diff --git
a/httemplate/view/svc_Common.html
b/httemplate/view/svc_Common.html
index
7ed63c7
..
9c4d71e
100644
(file)
--- a/
httemplate/view/svc_Common.html
+++ b/
httemplate/view/svc_Common.html
@@
-1,14
+1,13
@@
-<
% include('elements/svc_Common.html'
,
+<
& elements/svc_Common.html
,
'table' => $table,
'edit_url' => $edit_url, #$p."edit/svc_Common.html?svcdb=$table;svcnum=",
%opt,
'table' => $table,
'edit_url' => $edit_url, #$p."edit/svc_Common.html?svcdb=$table;svcnum=",
%opt,
- )
-%>
+&>
<%init>
# false laziness w/edit/svc_Common.html
<%init>
# false laziness w/edit/svc_Common.html
-$cgi->param('svcdb') =~ /^(svc_\w+)$/ or die "unparsable svcdb";
+$cgi->param('svcdb') =~ /^(svc_\w+)$/ or die "unpars
e
able svcdb";
my $table = $1;
require "FS/$table.pm";
my $table = $1;
require "FS/$table.pm";
@@
-26,6
+25,17
@@
if ( UNIVERSAL::can("FS::$table", 'table_info') ) {
}
keys %$fields;
$opt{'labels'} = \%labels;
}
keys %$fields;
$opt{'labels'} = \%labels;
+
+ #transform FS::svc_* table_info's structure into one svc_Common.html likes
+ delete $fields->{svcnum};
+ $opt{'fields'} = [ map { ref $fields->{$_}
+ ? { field => $_,
+ %{ $fields->{$_} }
+ }
+ : $_
+ } keys %$fields
+ ];
+
}
</%init>
}
</%init>