X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FDraft.pm;h=ed2f602ce6b995a7ee3ee702493c6b4bd3817860;hb=78078fbf7a94e349032c83ae324c87c94487e11a;hp=a450e2c9f58375a44e0af26f7458969004342e8f;hpb=46aa98a931708ad5ee5003437af92f0358e582b3;p=kivitendo-erp.git diff --git a/SL/Controller/Draft.pm b/SL/Controller/Draft.pm index a450e2c9f..ed2f602ce 100644 --- a/SL/Controller/Draft.pm +++ b/SL/Controller/Draft.pm @@ -68,6 +68,7 @@ sub action_save { $self->js ->flash('info', t8("Draft saved.")) ->dialog->close('#save_draft') + ->val('#draft_id', $draft->id) ->render; } } @@ -131,13 +132,24 @@ sub _build_form { sub draft_list { my ($self) = @_; - my $result = selectall_hashref_query($::form, $::form->get_standard_dbh, <module, $self->submodule); - SELECT d.*, date(d.itime) AS date, e.name AS employee_name + 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 - LEFT JOIN employee e ON d.employee_id = e.id - WHERE (d.module = ?) AND (d.submodule = ?) + 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 = ?) + AND (d.submodule = ?) + AND (d.employee_id = ?) + ORDER BY d.itime +SQL + } } sub dialog_html {