[freeside-commits] freeside/httemplate/edit part_svc.cgi, 1.62.2.1, 1.62.2.2 svc_acct.cgi, 1.53.2.1, 1.53.2.2 svc_phone.cgi, 1.7, 1.7.4.1

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	part_svc.cgi svc_acct.cgi svc_phone.cgi 
Log Message:
linking DIDs and users to PBXes, RT#7051

Index: part_svc.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/part_svc.cgi,v
retrieving revision 1.62.2.1
retrieving revision 1.62.2.2
diff -u -d -r1.62.2.1 -r1.62.2.2
--- part_svc.cgi	25 Jan 2010 17:41:10 -0000	1.62.2.1
+++ part_svc.cgi	25 Jan 2010 22:17:29 -0000	1.62.2.2
@@ -289,6 +289,14 @@
 %          } #endif
 %          $html .= '</SELECT>';
 %
+%        } elsif ( $def->{type} eq 'select-svc_pbx.html' ) {
+%
+%          $html .= include('/elements/select-svc_pbx.html',
+%                             'element_name' => "${layer}__${field}",
+%                             'element_etc'  => $disabled,
+%                             'multiple'     => ($flag eq 'S'),
+%                          );
+%
 %        } elsif ( $def->{type} eq 'radius_usergroup_selector' ) {
 %
 %          #XXX disable the RADIUS usergroup selector?  ugh it sure does need
@@ -304,7 +312,7 @@
 %
 %        } else {
 %
-%          $html .= '<font color="#ff0000">unknown type'. $def->{type};
+%          $html .= '<font color="#ff0000">unknown type '. $def->{type};
 %
 %        }
 %

Index: svc_acct.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_acct.cgi,v
retrieving revision 1.53.2.1
retrieving revision 1.53.2.2
diff -u -d -r1.53.2.1 -r1.53.2.2
--- svc_acct.cgi	23 Dec 2009 00:30:26 -0000	1.53.2.1
+++ svc_acct.cgi	25 Jan 2010 22:17:29 -0000	1.53.2.2
@@ -122,7 +122,14 @@
     </TD>
   </TR>
 % } 
-%
+
+<% include('/elements/tr-select-svc_pbx.html',
+             'curr_value' => $svc_acct->pbxsvc,
+             'part_svc'   => $part_svc,
+             'cust_pkg'   => $cust_pkg,
+          )
+%>
+
 %#pop
 %my $popnum = $svc_acct->popnum || 0;
 %if ( $part_svc->part_svc_column('popnum')->columnflag eq 'F' ) {

Index: svc_phone.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_phone.cgi,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -d -r1.7 -r1.7.4.1
--- svc_phone.cgi	3 Aug 2008 02:15:08 -0000	1.7
+++ svc_phone.cgi	25 Jan 2010 22:17:29 -0000	1.7.4.1
@@ -6,6 +6,10 @@
                                  type  => 'select-did',
                                  label => 'Phone number',
                                },
+                               { field => 'pbxsvc',
+                                 type  => 'select-svc_pbx',
+                                 label => 'PBX',
+                               },
                                'sip_password',
                                'pin',
                                'phone_name',
@@ -16,6 +20,7 @@
                                'sip_password' => 'SIP password',
                                'pin'          => 'Voicemail PIN',
                                'phone_name'   => 'Name',
+                               'pbxsvc'       => 'PBX',
                              },
            )
 %>