[freeside-commits] freeside/FS/FS svc_acct.pm, 1.268.2.13, 1.268.2.14 part_svc.pm, 1.33.2.1, 1.33.2.2

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv18028/FS/FS

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	svc_acct.pm part_svc.pm 
Log Message:
communigate, RT#7083

Index: part_svc.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_svc.pm,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -u -d -r1.33.2.1 -r1.33.2.2
--- part_svc.pm	28 Oct 2009 18:16:58 -0000	1.33.2.1
+++ part_svc.pm	21 Feb 2010 03:16:04 -0000	1.33.2.2
@@ -724,7 +724,18 @@
     ref($param->{'svc_acct__usergroup'})
       ? join(',', @{$param->{'svc_acct__usergroup'}} )
       : $param->{'svc_acct__usergroup'};
+
+  #unmunge cgp_accessmodes (falze laziness-ish w/edit/process/svc_acct.cgi)
+  $param->{'svc_acct__cgp_accessmodes'} ||=
+    join(' ', sort
+      grep { $_ !~ /^(flag|label)$/ }
+           map { /^svc_acct__cgp_accessmodes_([\w\/]+)$/ or die "no way"; $1; }
+               grep $param->{$_},
+                    grep /^svc_acct__cgp_accessmodes_([\w\/]+)$/,
+                         keys %$param
+        );
   
+
   my $new = new FS::part_svc ( {
     map {
       $_ => $param->{$_};

Index: svc_acct.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_acct.pm,v
retrieving revision 1.268.2.13
retrieving revision 1.268.2.14
diff -u -d -r1.268.2.13 -r1.268.2.14
--- svc_acct.pm	20 Feb 2010 22:33:10 -0000	1.268.2.13
+++ svc_acct.pm	21 Feb 2010 03:16:03 -0000	1.268.2.14
@@ -271,8 +271,21 @@
                          disable_fixed => 1,
                          disable_select => 1,
                        },
+        'cgp_type'=> { 
+                       label => 'Communigate account type',
+                       type => 'select',
+                       select_list => [ ],
+                       disable_inventory => 1,
+                       disable_select    => 1,
+                     },
+        'cgp_accessmodes' => { 
+                               label => 'Communigate enabled services',
+                               type  => 'communigate_pro-accessmodes',
+                               disable_inventory => 1,
+                               disable_select    => 1,
+                             },
         'quota'     => { 
-                         label => 'Quota',
+                         label => 'Quota', #Mail storage limit
                          type => 'text',
                          disable_inventory => 1,
                          disable_select => 1,
@@ -1085,7 +1098,7 @@
                                )
               || $self->ut_enum( 'password_selfchange', [ '', 'Y' ] )
               || $self->ut_enum( 'password_recover',    [ '', 'Y' ] )
-              || $self->ut_alphasn( 'cgp_accessmodes' )
+              || $self->ut_textn( 'cgp_accessmodes' )
               || $self->ut_alphan( 'cgp_type' )
   ;
   return $error if $error;