projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
EmailJournal: Typo in Klassennamen gefixt
[kivitendo-erp.git]
/
SL
/
Controller
/
EmailJournal.pm
diff --git
a/SL/Controller/EmailJournal.pm
b/SL/Controller/EmailJournal.pm
index
7c40a0d
..
551214e
100644
(file)
--- a/
SL/Controller/EmailJournal.pm
+++ b/
SL/Controller/EmailJournal.pm
@@
-27,6
+27,9
@@
__PACKAGE__->run_before('add_stylesheet');
sub action_list {
my ($self) = @_;
sub action_list {
my ($self) = @_;
+ if ( $::instance_conf->get_email_journal == 0 ) {
+ flash('info', $::locale->text('Storing the emails in the journal is currently disabled in the client configuration.'));
+ }
$self->render('email_journal/list',
title => $::locale->text('Email journal'),
ENTRIES => $self->models->get,
$self->render('email_journal/list',
title => $::locale->text('Email journal'),
ENTRIES => $self->models->get,
@@
-40,7
+43,7
@@
sub action_show {
$self->entry(SL::DB::EmailJournal->new(id => $::form->{id})->load);
$self->entry(SL::DB::EmailJournal->new(id => $::form->{id})->load);
- if (!$self->can_view_all && ($self->entry->sender_id != SL::DB::Manager::Emplyee->current->id)) {
+ if (!$self->can_view_all && ($self->entry->sender_id != SL::DB::Manager::Empl
o
yee->current->id)) {
$::form->error(t8('You do not have permission to access this entry.'));
}
$::form->error(t8('You do not have permission to access this entry.'));
}
@@
-54,7
+57,7
@@
sub action_download_attachment {
my $attachment = SL::DB::EmailJournalAttachment->new(id => $::form->{id})->load;
my $attachment = SL::DB::EmailJournalAttachment->new(id => $::form->{id})->load;
- if (!$self->can_view_all && ($attachment->email_journal->sender_id != SL::DB::Manager::Emplyee->current->id)) {
+ if (!$self->can_view_all && ($attachment->email_journal->sender_id != SL::DB::Manager::Empl
o
yee->current->id)) {
$::form->error(t8('You do not have permission to access this entry.'));
}
$::form->error(t8('You do not have permission to access this entry.'));
}