projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4d4171d
)
ACL for hardware class config, RT#85057
author
Ivan Kohler
<ivan@freeside.biz>
Mon, 9 Nov 2020 21:36:41 +0000
(13:36 -0800)
committer
Ivan Kohler
<ivan@freeside.biz>
Mon, 9 Nov 2020 21:36:41 +0000
(13:36 -0800)
FS/FS/AccessRight.pm
patch
|
blob
|
history
FS/FS/access_right.pm
patch
|
blob
|
history
httemplate/browse/hardware_class.html
patch
|
blob
|
history
httemplate/browse/hardware_status.html
patch
|
blob
|
history
httemplate/edit/hardware_class.html
patch
|
blob
|
history
httemplate/edit/hardware_status.html
patch
|
blob
|
history
httemplate/edit/process/hardware_class.html
patch
|
blob
|
history
httemplate/edit/process/hardware_status.html
patch
|
blob
|
history
httemplate/edit/process/hardware_type.html
patch
|
blob
|
history
httemplate/elements/menu.html
patch
|
blob
|
history
diff --git
a/FS/FS/AccessRight.pm
b/FS/FS/AccessRight.pm
index
701f772
..
5badba7
100644
(file)
--- a/
FS/FS/AccessRight.pm
+++ b/
FS/FS/AccessRight.pm
@@
-416,6
+416,8
@@
tie my %rights, 'Tie::IxHash',
{ rightname=>'Alarm configuration' },
{ rightname=>'Alarm global configuration', global=>1 },
{ rightname=>'Alarm configuration' },
{ rightname=>'Alarm global configuration', global=>1 },
+ { rightname=>'Edit hardware classes and types' },
+
{ rightname=> 'Configure network monitoring', global=>1 },
#{ rightname=>'Edit employees', global=>1, },
{ rightname=> 'Configure network monitoring', global=>1 },
#{ rightname=>'Edit employees', global=>1, },
diff --git
a/FS/FS/access_right.pm
b/FS/FS/access_right.pm
index
155da73
..
226c81e
100644
(file)
--- a/
FS/FS/access_right.pm
+++ b/
FS/FS/access_right.pm
@@
-261,6
+261,7
@@
sub _upgrade_data { # class method
'Edit customer note' => 'Delete customer note',
'Edit customer' => 'Edit customer invoice terms',
'Financial reports' => 'Basic payment and refund reports',
'Edit customer note' => 'Delete customer note',
'Edit customer' => 'Edit customer invoice terms',
'Financial reports' => 'Basic payment and refund reports',
+ 'Configuration' => 'Edit hardware clases and types',
);
# foreach my $old_acl ( keys %onetime ) {
);
# foreach my $old_acl ( keys %onetime ) {
diff --git
a/httemplate/browse/hardware_class.html
b/httemplate/browse/hardware_class.html
index
0bf314e
..
6423f4a
100644
(file)
--- a/
httemplate/browse/hardware_class.html
+++ b/
httemplate/browse/hardware_class.html
@@
-22,7
+22,7
@@
my $curuser = $FS::CurrentUser::CurrentUser;
die "access denied"
my $curuser = $FS::CurrentUser::CurrentUser;
die "access denied"
- unless $curuser->access_right('
Configuration
');
+ unless $curuser->access_right('
Edit hardware classes and types
');
my $menubar =
[ 'Hardware statuses' => $p.'browse/hardware_status.html',
my $menubar =
[ 'Hardware statuses' => $p.'browse/hardware_status.html',
diff --git
a/httemplate/browse/hardware_status.html
b/httemplate/browse/hardware_status.html
index
89ae830
..
64ad5ad
100644
(file)
--- a/
httemplate/browse/hardware_status.html
+++ b/
httemplate/browse/hardware_status.html
@@
-16,7
+16,7
@@
my $curuser = $FS::CurrentUser::CurrentUser;
die "access denied"
my $curuser = $FS::CurrentUser::CurrentUser;
die "access denied"
- unless $curuser->access_right('
Configuration
');
+ unless $curuser->access_right('
Edit hardware classes and types
');
my $menubar = [ 'Hardware classes' => $p.'browse/hardware_class.html',
'Add a status' => $p.'edit/hardware_status.html' ];
my $menubar = [ 'Hardware classes' => $p.'browse/hardware_class.html',
'Add a status' => $p.'edit/hardware_status.html' ];
diff --git
a/httemplate/edit/hardware_class.html
b/httemplate/edit/hardware_class.html
index
26f487d
..
8d5412b
100644
(file)
--- a/
httemplate/edit/hardware_class.html
+++ b/
httemplate/edit/hardware_class.html
@@
-11,6
+11,6
@@
<%init>
die "access denied"
<%init>
die "access denied"
- unless $FS::CurrentUser::CurrentUser->access_right('
Configuration
');
+ unless $FS::CurrentUser::CurrentUser->access_right('
Edit hardware classes and types
');
</%init>
</%init>
diff --git
a/httemplate/edit/hardware_status.html
b/httemplate/edit/hardware_status.html
index
23e5b6e
..
c8cb68c
100644
(file)
--- a/
httemplate/edit/hardware_status.html
+++ b/
httemplate/edit/hardware_status.html
@@
-19,6
+19,6
@@
<%init>
die "access denied"
<%init>
die "access denied"
- unless $FS::CurrentUser::CurrentUser->access_right('
Configuration
');
+ unless $FS::CurrentUser::CurrentUser->access_right('
Edit hardware classes and types
');
</%init>
</%init>
diff --git
a/httemplate/edit/process/hardware_class.html
b/httemplate/edit/process/hardware_class.html
index
64bc72e
..
54e2af6
100644
(file)
--- a/
httemplate/edit/process/hardware_class.html
+++ b/
httemplate/edit/process/hardware_class.html
@@
-6,6
+6,6
@@
<%init>
die "access denied"
<%init>
die "access denied"
- unless $FS::CurrentUser::CurrentUser->access_right('
Configuration
');
+ unless $FS::CurrentUser::CurrentUser->access_right('
Edit hardware classes and types
');
</%init>
</%init>
diff --git
a/httemplate/edit/process/hardware_status.html
b/httemplate/edit/process/hardware_status.html
index
61f02e2
..
d790eb5
100644
(file)
--- a/
httemplate/edit/process/hardware_status.html
+++ b/
httemplate/edit/process/hardware_status.html
@@
-6,6
+6,6
@@
<%init>
die "access denied"
<%init>
die "access denied"
- unless $FS::CurrentUser::CurrentUser->access_right('
Configuration
');
+ unless $FS::CurrentUser::CurrentUser->access_right('
Edit hardware classes and types
');
</%init>
</%init>
diff --git
a/httemplate/edit/process/hardware_type.html
b/httemplate/edit/process/hardware_type.html
index
5278701
..
954e76d
100644
(file)
--- a/
httemplate/edit/process/hardware_type.html
+++ b/
httemplate/edit/process/hardware_type.html
@@
-6,6
+6,6
@@
<%init>
die "access denied"
<%init>
die "access denied"
- unless $FS::CurrentUser::CurrentUser->access_right('
Configuration
');
+ unless $FS::CurrentUser::CurrentUser->access_right('
Edit hardware classes and types
');
</%init>
</%init>
diff --git
a/httemplate/elements/menu.html
b/httemplate/elements/menu.html
index
091ec12
..
f6fc254
100644
(file)
--- a/
httemplate/elements/menu.html
+++ b/
httemplate/elements/menu.html
@@
-693,7
+693,7
@@
$config_export_svc{'Circuits'} = [ \%config_circuit, '' ]
$config_export_svc{'Fiber'} = [ \%config_fiber, '' ]
if $curuser->access_right('Configuration');
$config_export_svc{'Hardware types'} = [ $fsurl.'browse/hardware_class.html', 'Set up hardware type catalog' ]
$config_export_svc{'Fiber'} = [ \%config_fiber, '' ]
if $curuser->access_right('Configuration');
$config_export_svc{'Hardware types'} = [ $fsurl.'browse/hardware_class.html', 'Set up hardware type catalog' ]
- if $curuser->access_right('
Configuration
');
+ if $curuser->access_right('
Edit hardware classes and types
');
tie my %config_pkg_reason, 'Tie::IxHash',
'Cancel reasons' => [ $fsurl.'browse/reason_type.html?class=C', 'Cancel reasons explain why a service was cancelled.' ],
tie my %config_pkg_reason, 'Tie::IxHash',
'Cancel reasons' => [ $fsurl.'browse/reason_type.html?class=C', 'Cancel reasons explain why a service was cancelled.' ],