projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9d1c564
)
separate edit and delete rights for customer notes, RT#76001
author
Ivan Kohler
<ivan@freeside.biz>
Mon, 15 May 2017 17:49:38 +0000
(10:49 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Mon, 15 May 2017 17:49:38 +0000
(10:49 -0700)
FS/FS/AccessRight.pm
patch
|
blob
|
history
FS/FS/access_right.pm
patch
|
blob
|
history
httemplate/misc/delete-note.html
patch
|
blob
|
history
httemplate/view/cust_main/menu.html
patch
|
blob
|
history
httemplate/view/cust_main/notes/notes.html
patch
|
blob
|
history
diff --git
a/FS/FS/AccessRight.pm
b/FS/FS/AccessRight.pm
index
285a770
..
2d95953
100644
(file)
--- a/
FS/FS/AccessRight.pm
+++ b/
FS/FS/AccessRight.pm
@@
-258,6
+258,7
@@
tie my %rights, 'Tie::IxHash',
'Customer note and attachment rights' => [
'Add customer note', #NEW
'Edit customer note', #NEW
'Customer note and attachment rights' => [
'Add customer note', #NEW
'Edit customer note', #NEW
+ 'Delete customer note', #NEWEST
'View attachments', #NEW
'Browse attachments', #NEW
'Download attachment', #NEW
'View attachments', #NEW
'Browse attachments', #NEW
'Download attachment', #NEW
diff --git
a/FS/FS/access_right.pm
b/FS/FS/access_right.pm
index
1a0a1cb
..
f1614ff
100644
(file)
--- a/
FS/FS/access_right.pm
+++ b/
FS/FS/access_right.pm
@@
-258,6
+258,7
@@
sub _upgrade_data { # class method
],
'Resend invoices' => 'Print and mail invoices',
'List customers' => 'Customers: Customer churn report',
],
'Resend invoices' => 'Print and mail invoices',
'List customers' => 'Customers: Customer churn report',
+ 'Edit customer note' => 'Delete customer note',
);
# foreach my $old_acl ( keys %onetime ) {
);
# foreach my $old_acl ( keys %onetime ) {
diff --git
a/httemplate/misc/delete-note.html
b/httemplate/misc/delete-note.html
index
436326f
..
e6d2127
100644
(file)
--- a/
httemplate/misc/delete-note.html
+++ b/
httemplate/misc/delete-note.html
@@
-1,6
+1,6
@@
<%init>
die "access denied"
<%init>
die "access denied"
- unless $FS::CurrentUser::CurrentUser->access_right('
Edit
customer note');
+ unless $FS::CurrentUser::CurrentUser->access_right('
Delete
customer note');
my ($notenum) = $cgi->keywords;
$notenum =~ /^\d+$/ or die "bad notenum '$notenum'";
my ($notenum) = $cgi->keywords;
$notenum =~ /^\d+$/ or die "bad notenum '$notenum'";
@@
-8,4
+8,4
@@
my $note = FS::cust_main_note->by_key($notenum)
or die "notenum '$notenum' not found";
$note->delete;
</%init>
or die "notenum '$notenum' not found";
$note->delete;
</%init>
-<% $cgi->redirect($p.'view/cust_main.cgi?
'.$note->custnum
) %>
+<% $cgi->redirect($p.'view/cust_main.cgi?
custnum='.$note->custnum. ';show=notes'
) %>
diff --git
a/httemplate/view/cust_main/menu.html
b/httemplate/view/cust_main/menu.html
index
9e910f8
..
dcba1fb
100644
(file)
--- a/
httemplate/view/cust_main/menu.html
+++ b/
httemplate/view/cust_main/menu.html
@@
-206,7
+206,7
@@
my @menu = (
confexists => '!cust_main-disable_notes',
acl => 'Add customer note',
width => 875,
confexists => '!cust_main-disable_notes',
acl => 'Add customer note',
width => 875,
- height => 5
3
8,
+ height => 5
4
8,
},
{
label => 'Attach file',
},
{
label => 'Attach file',
diff --git
a/httemplate/view/cust_main/notes/notes.html
b/httemplate/view/cust_main/notes/notes.html
index
f998ba4
..
c643003
100644
(file)
--- a/
httemplate/view/cust_main/notes/notes.html
+++ b/
httemplate/view/cust_main/notes/notes.html
@@
-69,19
+69,21
@@
function display_notes_classnum (classnum) {
% "?custnum=$custnum".
% ";notenum=$notenum",
% 'actionlabel' => emt('Edit customer note'),
% "?custnum=$custnum".
% ";notenum=$notenum",
% 'actionlabel' => emt('Edit customer note'),
-% 'width' =>
616
,
-% 'height' => 5
75
,
+% 'width' =>
875
,
+% 'height' => 5
48
,
% 'frame' => 'top',
% );
% my $clickjs = qq!onclick="$onclick"!;
%
% my $edit = '';
% 'frame' => 'top',
% );
% my $clickjs = qq!onclick="$onclick"!;
%
% my $edit = '';
-% if ($curuser->access_right('Edit customer note') ) {
+% if ( $curuser->access_right('Edit customer note') ) {
+% $edit = qq! <A HREF="javascript:void(0);" $clickjs>(!.emt('edit').')</A>';
+% }
+% if ( $curuser->access_right('Delete customer note') ) {
% my $delete_url = $fsurl.'misc/delete-note.html?'.$notenum;
% my $delete_url = $fsurl.'misc/delete-note.html?'.$notenum;
-% $edit = qq! <A HREF="javascript:void(0);" $clickjs>(!.emt('edit').')</A>'.
-% qq! <A HREF="$delete_url" !.
-% qq! onclick="return confirm('Delete this note?')">!.
-% '('.emt('delete').')</A>';
+% $edit .= qq! <A HREF="$delete_url" !.
+% qq! onclick="return confirm('Delete this note?')">!.
+% '('.emt('delete').')</A>';
% }
%
<TR CLASS="grid custnote<% $note->sticky ? ' stickynote' : '' %>"
% }
%
<TR CLASS="grid custnote<% $note->sticky ? ' stickynote' : '' %>"