[freeside-commits] freeside/httemplate/edit/elements edit.html, 1.39, 1.39.2.1 svc_Common.html, 1.8, 1.8.2.1

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	edit.html svc_Common.html 
Log Message:
linking DIDs and users to PBXes, RT#7051

Index: svc_Common.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/elements/svc_Common.html,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- svc_Common.html	9 May 2009 01:44:07 -0000	1.8
+++ svc_Common.html	25 Jan 2010 22:17:29 -0000	1.8.2.1
@@ -54,6 +54,7 @@
 
                  'field_callback' => sub {
                    my ($cgi, $object, $f) = @_;
+
                    my $columndef = $part_svc->part_svc_column($f->{'field'});
                    my $flag = $columndef->columnflag;
                    if ( $flag eq 'F' ) {
@@ -62,6 +63,15 @@
                                       : 'hidden';
                      $f->{'value'} = $columndef->columnvalue;
                    }
+
+                   if ( $f->{'type'} eq 'select-svc_pbx' ) {
+                     $f->{'include_opt_callback'} =
+                       sub { ( 'pkgnum'  => $pkgnum,
+                               'svcpart' => $svcpart,
+                             );
+                           };
+                   }
+
                  },
 
                  'html_init' => sub {

Index: edit.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/elements/edit.html,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -d -r1.39 -r1.39.2.1
--- edit.html	18 Sep 2009 19:28:59 -0000	1.39
+++ edit.html	25 Jan 2010 22:17:29 -0000	1.39.2.1
@@ -40,8 +40,10 @@
                     'disabled' => 0,
                     'onchange' => 'javascript_function',
 
-                    #m2 stuff only tested w/selectlayers so far
-                    #might work w/select too, dunno others
+                    'include_opt_callback' => sub { #my $ = @_;
+                                                    ( 'option' => 'value', );
+                                                  },
+
                     'm2name_table'   => 'table_name',
                     'm2name_namecol' => 'name_column',
                     #OR#
@@ -293,6 +295,10 @@
 %     $include_common{'colspan'} = $f->{colspan} if $f->{colspan};
 %   }
 %
+%   if ( $f->{include_opt_callback} ) {
+%     %include_common = ( %include_common, &{ $f->{include_opt_callback} } );
+%   }
+%
 %   my $layer_prefix_on = '';
 %
 %   my $include_sub = sub {