projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cd41302
)
backport from 3/master to fix svc_cable viewing, RT#22009
author
Ivan Kohler
<ivan@freeside.biz>
Thu, 10 Oct 2013 16:02:46 +0000
(09:02 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Thu, 10 Oct 2013 16:02:46 +0000
(09:02 -0700)
httemplate/view/elements/svc_Common.html
patch
|
blob
|
history
diff --git
a/httemplate/view/elements/svc_Common.html
b/httemplate/view/elements/svc_Common.html
index
fe9f065
..
466fa2b
100644
(file)
--- a/
httemplate/view/elements/svc_Common.html
+++ b/
httemplate/view/elements/svc_Common.html
@@
-59,18
+59,22
@@
function areyousure(href) {
% foreach my $f ( @$fields ) {
%
% foreach my $f ( @$fields ) {
%
-% my($field, $type, $value
, $hack_strict_refs
);
+% my($field, $type, $value);
% if ( ref($f) ) {
% $field = $f->{'field'};
% if ( ref($f) ) {
% $field = $f->{'field'};
-% $hack_strict_refs = \&{ $f->{'value'} } if $f->{'value'};
-% $value = $f->{'value'}
-% ? &$hack_strict_refs($svc_x)
-% : encode_entities($svc_x->$field);
% $type = $f->{'type'} || 'text';
% $type = $f->{'type'} || 'text';
+% if ( $f->{'value_callback'} ) {
+% my $hack_strict_refs = \&{ $f->{'value_callback'} };
+% $value = &$hack_strict_refs($svc_x);
+% } else {
+% $value = exists($f->{'value'})
+% ? $f->{'value'}
+% : encode_entities($svc_x->$field);
+% }
% } else {
% $field = $f;
% } else {
% $field = $f;
-% $value = encode_entities($svc_x->$field);
% $type = 'text';
% $type = 'text';
+% $value = encode_entities($svc_x->$field);
% }
%
% my $columndef = $part_svc->part_svc_column($field);
% }
%
% my $columndef = $part_svc->part_svc_column($field);