X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FDraft.pm;h=02e74f586b70babcc48572c8ff5ad0cbb2e97b00;hb=afd5395bfad1a84a590d567f8cb2d4e4967b16e3;hp=6c0110ab350f5b4652aa22fe8594a41aeedda989;hpb=c954dea7c1b814d66b8c31d04fa70a1bbbcce71e;p=kivitendo-erp.git diff --git a/SL/Controller/Draft.pm b/SL/Controller/Draft.pm index 6c0110ab3..02e74f586 100644 --- a/SL/Controller/Draft.pm +++ b/SL/Controller/Draft.pm @@ -9,7 +9,7 @@ use SL::Locale::String qw(t8); use SL::Request; use SL::DB::Draft; use SL::DBUtils qw(selectall_hashref_query); -use YAML; +use SL::YAML; use List::Util qw(max); use Rose::Object::MakeMethods::Generic ( @@ -53,7 +53,7 @@ sub action_save { module => $self->module, submodule => $self->submodule, description => $description, - form => YAML::Dump($form), + form => SL::YAML::Dump($form), employee_id => SL::DB::Manager::Employee->current->id, ); @@ -83,7 +83,7 @@ sub action_load { require $allowed_modules{ $self->draft->module }; } my $params = delete $::form->{form}; - my $new_form = YAML::Load($self->draft->form); + my $new_form = SL::YAML::Load($self->draft->form); $::form->{$_} = $new_form->{$_} for keys %$new_form; $::form->{"draft_$_"} = $self->draft->$_ for qw(id description); @@ -132,7 +132,16 @@ sub _build_form { sub draft_list { my ($self) = @_; - my $result = selectall_hashref_query($::form, $::form->get_standard_dbh, <module, $self->submodule, SL::DB::Manager::Employee->current->id); + if ($::auth->assert('all_drafts_edit', 1)) { + my $result = selectall_hashref_query($::form, $::form->get_standard_dbh, <module, $self->submodule); + SELECT d.*, date(d.itime) AS date + FROM drafts d + WHERE (d.module = ?) + AND (d.submodule = ?) + ORDER BY d.itime +SQL + } else { + my $result = selectall_hashref_query($::form, $::form->get_standard_dbh, <module, $self->submodule, SL::DB::Manager::Employee->current->id); SELECT d.*, date(d.itime) AS date FROM drafts d WHERE (d.module = ?) @@ -140,6 +149,7 @@ sub draft_list { AND (d.employee_id = ?) ORDER BY d.itime SQL + } } sub dialog_html {