Revert "Anpassungen an neues SL::File::Object Interface"

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

diff --git a/SL/Controller/DownloadZip.pm b/SL/Controller/DownloadZip.pm
index 06f62213c089f5d94e7abe1afb053edf4a4301bc..5bac4ba2e2132a791c9c9f0c004224cb28e525ba 100644 (file)
--- a/SL/Controller/DownloadZip.pm
+++ b/SL/Controller/DownloadZip.pm
@@ -64,7 +64,9 @@ 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($_->get_file ), Encode::encode($name_encoding,$item->part->partnumber.'/'.$_->file_name)) for @wanted_files;
+        $zip->addFile(SL::File->get_file_path(dbfile => $_ ),
+                      Encode::encode($name_encoding,$item->part->partnumber.'/'.$_->{file_name})
+                      ) for @wanted_files;

       }
     }
   }
       }
     }
   }


@@ -116,7 +118,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();