diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-05-04 16:28:55 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-05-04 16:28:55 -0700 |
| commit | ed98fabaf7bc3f2127ca33e465632312bd8815fc (patch) | |
| tree | d9921b912d4abf93687573ccc875f35d0e6d4232 | |
| parent | f715c23517292a11330ab241fb13221fd89ffc37 (diff) | |
add an ACL to control snom/vonage/etc. employee telephony integration, RT#34839
| -rw-r--r-- | FS/FS/AccessRight.pm | 6 | ||||
| -rw-r--r-- | FS/FS/access_right.pm | 3 | ||||
| -rw-r--r-- | httemplate/pref/pref.html | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm index 82423d8db..95e7aeab8 100644 --- a/FS/FS/AccessRight.pm +++ b/FS/FS/AccessRight.pm @@ -348,6 +348,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 1ea6e4951..7a4c4dad9 100644 --- a/FS/FS/access_right.pm +++ b/FS/FS/access_right.pm @@ -254,6 +254,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 ) { @@ -274,7 +275,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 383e5f7dd..5e722b043 100644 --- a/httemplate/pref/pref.html +++ b/httemplate/pref/pref.html @@ -204,6 +204,8 @@ Development </TABLE> <BR> +% if ( $curuser->access_right('Employee preference telephony integration') ) { + SNOM integration <% ntable("#cccccc",2) %> @@ -248,6 +250,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=""> |