SL::DB::Order: Tests für new_from_multi

[mfinanz.git] / SL / Controller / File.pm

diff --git a/SL/Controller/File.pm b/SL/Controller/File.pm
index bb976e0566440f6727dbd58b56b1a24952c189c1..7a85106918ff752b8722162fc5dfb05d0d2613f6 100644 (file)
--- a/SL/Controller/File.pm
+++ b/SL/Controller/File.pm
@@ -135,7 +135,8 @@ sub action_ajax_unimport {
 
 sub action_ajax_rename {
   my ($self) = @_;
-  my $file = SL::File->get(id => $::form->{id});
+  my ($id, $version) = split /_/, $::form->{id};
+  my $file = SL::File->get(id => $id);
   if ( ! $file ) {
     $self->js->flash('error', $::locale->text('File not exists !'))->render();
     return;
@@ -350,9 +351,13 @@ sub _delete_all {
   foreach my $id_version (@{ $::form->{$ids} || [] }) {
     my ($id, $version) = split /_/, $id_version;
     my $dbfile = SL::File->get(id => $id);
-    $dbfile->version($version) if $dbfile && $version;
-    if ( $dbfile && $dbfile->delete ) {
-      $files .= ' ' . $dbfile->file_name;
+    if ( $dbfile ) {
+      if ( $version ) {
+        $dbfile->version($version);
+        $files .= ' ' . $dbfile->file_name if $dbfile->delete_version;
+      } else {
+        $files .= ' ' . $dbfile->file_name if $dbfile->delete;
+      }
     }
   }
   $self->js->flash('info', $infotext . $files) if $files;
@@ -458,7 +463,7 @@ sub _mk_render {
         my $first = shift @{$self->existing};
         my ($first_id, $sfile) = split('_', $first, 2);
         my $file = SL::File->get(id => $first_id );
-        $self->js->run('kivi.File.askForRename', $first_id, $file->file_name, $sfile, join (',', @{$self->existing}), $self->is_global);
+        $self->js->run('kivi.File.askForRename', $first_id, $file->file_type, $file->file_name, $sfile, join (',', @{$self->existing}), $self->is_global);
       }
       $self->js->render();
     } else {