[freeside-commits] branch FREESIDE_3_BRANCH updated. 86637503b5608164cf31aea501f131c74e27b724

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  86637503b5608164cf31aea501f131c74e27b724 (commit)
      from  38cd4a53e99e0583de526262b31a8b93debca4c7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 86637503b5608164cf31aea501f131c74e27b724
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon May 4 16:28:58 2015 -0700

    add an ACL to control snom/vonage/etc. employee telephony integration, RT#34839

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index e97cc54..71db3f2 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -347,6 +347,12 @@ tie my %rights, 'Tie::IxHash',
   ###
   #'Database access rights' => [
     { rightname=>'Raw SQL', global=>1 }, #NEW
+  #]
+
+  #'Employee preference rights' => [
+    { rightname=>'Employee preference telephony integration' },
+  #]
+
   ],
   
   ###
diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm
index b44c21c..6de16f6 100644
--- a/FS/FS/access_right.pm
+++ b/FS/FS/access_right.pm
@@ -251,6 +251,7 @@ sub _upgrade_data { # class method
     'Void credit' => 'Void credit',
     'Unvoid credit' => 'Unvoid credit',
     'Add on-the-fly void credit reason' => 'Add on-the-fly void credit reason',
+    '_ALL' => 'Employee preference telephony integration',
   );
 
 #  foreach my $old_acl ( keys %onetime ) {
@@ -271,7 +272,7 @@ sub _upgrade_data { # class method
 
       # grant $new_acl to all groups who have $old_acl
       for my $group (@all_groups) {
-        next unless $group->access_right($old_acl);
+        next unless $old_acl eq '_ALL' || $group->access_right($old_acl);
         next if     $group->access_right($new_acl);
         my $access_right = FS::access_right->new( {
             'righttype'   => 'FS::access_group',
diff --git a/httemplate/pref/pref.html b/httemplate/pref/pref.html
index 832df78..1b0ea06 100644
--- a/httemplate/pref/pref.html
+++ b/httemplate/pref/pref.html
@@ -202,6 +202,8 @@ Development
 </TABLE>
 <BR>
 
+% if ( $curuser->access_right('Employee preference telephony integration') ) {
+
 SNOM integration
 <% ntable("#cccccc",2) %>
 
@@ -246,6 +248,7 @@ Vonage integration (see <a href="https://secure.click2callu.com/">Click2Call</a>
 </TABLE>
 <BR>
 
+% }
 
 % foreach my $prop (qw( height width availHeight availWidth colorDepth )) {
   <INPUT TYPE="hidden" NAME="<% $prop %>" VALUE="">

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/AccessRight.pm      |    6 ++++++
 FS/FS/access_right.pm     |    3 ++-
 httemplate/pref/pref.html |    3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)