Anpassungen an neues SL::File::Object Interface

diff --git a/SL/Controller/DownloadZip.pm b/SL/Controller/DownloadZip.pm
index 5bac4ba2e2132a791c9c9f0c004224cb28e525ba..06f62213c089f5d94e7abe1afb053edf4a4301bc 100644 (file)
--- a/SL/Controller/DownloadZip.pm
+++ b/SL/Controller/DownloadZip.pm
@@ -64,9 +64,7 @@ sub action_download_orderitems_files {
       # }
       if ( scalar (@wanted_files) > 0 ) {
         $zip->addDirectory($item->part->partnumber);
       # }
       if ( scalar (@wanted_files) > 0 ) {
         $zip->addDirectory($item->part->partnumber);

-        $zip->addFile(SL::File->get_file_path(dbfile => $_ ),
-                      Encode::encode($name_encoding,$item->part->partnumber.'/'.$_->{file_name})
-                      ) for @wanted_files;
+        $zip->addFile($_->get_file ), Encode::encode($name_encoding,$item->part->partnumber.'/'.$_->file_name)) for @wanted_files;

       }
     }
   }
       }
     }
   }


@@ -118,7 +116,7 @@ THis method must be inserted into the customer branch:
     };
     if ( rowcount == 0 ) {
         kivi.display_flash('error', kivi.t8('No articles have been added yet.'));
     };
     if ( rowcount == 0 ) {
         kivi.display_flash('error', kivi.t8('No articles have been added yet.'));

-        return false; 
+        return false;

     }
     for (var i = 1; i <= rowcount; i++) {
         data['parts_id_'+i] =  $('#id_' + i).val();
     }
     for (var i = 1; i <= rowcount; i++) {
         data['parts_id_'+i] =  $('#id_' + i).val();

diff --git a/SL/Controller/EmailJournal.pm b/SL/Controller/EmailJournal.pm
index a4ffc62b591dda857c52e2ae81219eefa9a1e466..c818cc393de2b95d1c5cb5d9a0d4958002901b53 100644 (file)
--- a/SL/Controller/EmailJournal.pm
+++ b/SL/Controller/EmailJournal.pm
@@ -69,7 +69,7 @@ sub action_download_attachment {
   my $ref = \$attachment->content;
   if ( $attachment->file_id > 0 ) {
     my $file = SL::File->get(id => $attachment->file_id );
   my $ref = \$attachment->content;
   if ( $attachment->file_id > 0 ) {
     my $file = SL::File->get(id => $attachment->file_id );

-    $ref = SL::File->get_content(dbfile => $file) if $file;
+    $ref = $file->get_content if $file;

   }
   $self->send_file($ref, name => $attachment->name, type => $attachment->mime_type);
 }
   }
   $self->send_file($ref, name => $attachment->name, type => $attachment->mime_type);
 }

diff --git a/SL/Form.pm b/SL/Form.pm
index 644b9dbead7a36222070f265990105ef14216533..5424a7c923cbd2e6812b59471d953208c058ddeb 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1212,9 +1212,9 @@ sub send_email {
       }
     }
     foreach my $attfile ( @attfiles ) {
       }
     }
     foreach my $attfile ( @attfiles ) {

-      push @{ $mail->{attachments} }, { path => SL::File->get_file_path(dbfile => $attfile),
+      push @{ $mail->{attachments} }, { path => $attfile->get_file,

                                         id   => $attfile->id,
                                         id   => $attfile->id,

-                                        type => $attfile->file_mime_type,
+                                        type => $attfile->mime_type,

                                         name => $attfile->file_name };
     }
   }
                                         name => $attfile->file_name };
     }
   }