[freeside-commits] freeside/httemplate/edit svc_domain.cgi, 1.17.2.10, 1.17.2.11 svc_acct.cgi, 1.53.2.13, 1.53.2.14

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail.420.am:/tmp/cvs-serv27254/httemplate/edit

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	svc_domain.cgi svc_acct.cgi 
Log Message:
add EmptyTrash values and finish consolidating the CGP timezone arrays, RT#7083

Index: svc_acct.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_acct.cgi,v
retrieving revision 1.53.2.13
retrieving revision 1.53.2.14
diff -u -w -d -r1.53.2.13 -r1.53.2.14
--- svc_acct.cgi	23 Jul 2010 09:33:01 -0000	1.53.2.13
+++ svc_acct.cgi	23 Jul 2010 10:03:06 -0000	1.53.2.14
@@ -392,10 +392,16 @@
     </TD>
   </TR>
 
-  <TR>
-    <TD ALIGN="right">On logout remove trash</TD>
-    <TD><INPUT TYPE="text" NAME="cgp_emptytrash" VALUE="<% $svc_acct->cgp_emptytrash %>"></TD>
-  </TR>
+  <% include('/elements/tr-select.html',
+               'label'      => 'On logout remove trash',
+               'field'      => 'cgp_emptytrash',
+               'options'    => $svc_acct->cgp_emptytrash_values,
+               'labels'     => {
+                                 '' => 'default (92 days)', #right?
+                               },
+               'curr_value' => $svc_acct->cgp_emptytrash,
+            )
+  %>
 
   <% include('/elements/tr-select.html',
                'label'      => 'Language',
@@ -411,7 +417,7 @@
   <% include('/elements/tr-select.html',
                'label'      => 'Time zone',
                'field'      => 'cgp_timezone',
-               'options'    => $svc_acct->cgp_timezone,
+               'options'    => $svc_acct->cgp_timezone_values,
                'labels'     => {
                                  '' => 'default (HostOS)',
                                },

Index: svc_domain.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_domain.cgi,v
retrieving revision 1.17.2.10
retrieving revision 1.17.2.11
diff -u -w -d -r1.17.2.10 -r1.17.2.11
--- svc_domain.cgi	23 Jul 2010 09:33:01 -0000	1.17.2.10
+++ svc_domain.cgi	23 Jul 2010 10:03:06 -0000	1.17.2.11
@@ -220,11 +220,17 @@
     </TD>
   </TR>
 
-  <% include('/elements/tr-input-text.html',
+  <% include('/elements/tr-select.html',
                'label'      => 'On logout remove trash',
+               'field'      => 'acct_def_cgp_emptytrash',
+               'options'    => $svc_domain->cgp_emptytrash_values,
+               'labels'     => {
+                                 '' => 'default (92 days)', #right?
+                               },
                'curr_value' => $svc_domain->acct_def_cgp_emptytrash,
             )
   %>
+
   <% include('/elements/tr-select.html',
                'label'      => 'Language',
                'field'      => 'acct_def_cgp_language',
@@ -239,7 +245,7 @@
   <% include('/elements/tr-select.html',
                'label'      => 'Time zone',
                'field'      => 'acct_def_cgp_timezone',
-               'options'    => $svc_domain->cgp_timezone,
+               'options'    => $svc_domain->cgp_timezone_values,
                'labels'     => {
                                  '' => 'default (HostOS)',
                                },