From 4d510fab209dcfd9e6ec75a55ee653593e2d1435 Mon Sep 17 00:00:00 2001
From: levinse <levinse>
Date: Thu, 25 Nov 2010 20:02:55 +0000
Subject: more sane svc_dsl UI, RT7111

---
 httemplate/view/elements/svc_Common.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'httemplate/view/elements')

diff --git a/httemplate/view/elements/svc_Common.html b/httemplate/view/elements/svc_Common.html
index 25845ddc5..e3b8da4fe 100644
--- a/httemplate/view/elements/svc_Common.html
+++ b/httemplate/view/elements/svc_Common.html
@@ -65,10 +65,10 @@ Unprovision this Service</A>
 %
 %   my($field, $type, $value, $hack_strict_refs);
 %   if ( ref($f) ) {
-%     $field = $f->{'field'},
+%     $field = $f->{'field'};
 %     $hack_strict_refs = \&{ $f->{'value'} } if $f->{'value'};
 %     $value = $f->{'value'} ? &$hack_strict_refs($svc_x) : $svc_x->$field;
-%     $type  = $f->{'type'} || 'text',
+%     $type  = $f->{'type'} || 'text';
 %   } else {
 %     $field = $f;
 %     $value = $svc_x->$field;
@@ -86,6 +86,9 @@ Unprovision this Service</A>
           %>
         </TD>
 
+%	$value = time2str($date_format,$value) if ( $type eq 'date' && $value );
+%	$value = time2str("$date_format %H:%M",$value) if ( $type eq 'datetime' && $value );
+%	$value = $value eq 'Y' ? 'Yes' : 'No' if ( $type eq 'checkbox' );
 %       #eventually more options for <SELECT>, etc. fields
 
         <TD BGCOLOR="#ffffff"><% $value %><TD>
@@ -125,6 +128,9 @@ die "access denied"
 
 my(%opt) = @_;
 
+my $conf = new FS::Conf;
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
 my $table = $opt{'table'};
 
 my $fields = $opt{'fields'}
-- 
cgit v1.2.1