From: Bernd Bleßmann Date: Mon, 28 Mar 2022 14:48:13 +0000 (+0200) Subject: Briefe: Rechteprüfung gefixed X-Git-Tag: kivitendo-mebil_0.1-0~10^2~2^2~75 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=65604fea85234a5ae3e787f7cafd81ece6b8621d;p=kivitendo-erp.git Briefe: Rechteprüfung gefixed Beim Öffnen eines Briefes aus dem Bericht wurde die Info is_sales nicht mitgegeben. Daher wurde immer auf Rechte im Einkauf geprüft, egal, ob Ein- oder Verkauf. - $self->is_sales verwenden, denn das prüft, ob $::form->{is_sales} vorhanden ist - is_sales der URL für den Link auf den Brief mitgeben --- diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm index 4da3e1918..ed31c9349 100644 --- a/SL/Controller/Letter.pm +++ b/SL/Controller/Letter.pm @@ -379,9 +379,9 @@ sub prepare_report { my %column_defs = ( date => { text => t8('Date'), sub => sub { $_[0]->date_as_date } }, subject => { text => t8('Subject'), sub => sub { $_[0]->subject }, - obj_link => sub { $self->url_for(action => 'edit', 'letter.id' => $_[0]->id, callback => $self->models->get_callback) } }, + obj_link => sub { $self->url_for(action => 'edit', 'letter.id' => $_[0]->id, is_sales => $self->is_sales, callback => $self->models->get_callback) } }, letternumber => { text => t8('Letternumber'), sub => sub { $_[0]->letternumber }, - obj_link => sub { $self->url_for(action => 'edit', 'letter.id' => $_[0]->id, callback => $self->models->get_callback) } }, + obj_link => sub { $self->url_for(action => 'edit', 'letter.id' => $_[0]->id, is_sales => $self->is_sales, callback => $self->models->get_callback) } }, customer_id => { text => t8('Customer'), sub => sub { SL::DB::Manager::Customer->find_by_or_create(id => $_[0]->customer_id)->displayable_name }, visible => $self->is_sales }, vendor_id => { text => t8('Vendor'), sub => sub { SL::DB::Manager::Vendor->find_by_or_create(id => $_[0]->vendor_id)->displayable_name }, visible => !$self->is_sales}, contact => { text => t8('Contact'), sub => sub { $_[0]->contact ? $_[0]->contact->full_name : '' } }, @@ -588,13 +588,13 @@ sub init_is_sales { } sub check_auth_edit { - $::form->{is_sales} ? $::auth->assert('sales_letter_edit') - : $::auth->assert('purchase_letter_edit'); + $_[0]->is_sales ? $::auth->assert('sales_letter_edit') + : $::auth->assert('purchase_letter_edit'); } sub check_auth_report { - $::form->{is_sales} ? $::auth->assert('sales_letter_report') - : $::auth->assert('purchase_letter_report'); + $_[0]->is_sales ? $::auth->assert('sales_letter_report') + : $::auth->assert('purchase_letter_report'); } sub setup_load_letter_draft_action_bar {