X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FImageUpload.pm;h=18561e0e761ec2e873094dc4485c9d15af99b9e2;hb=d4925a8b60f04674885e30d9316dc0263f8b9a84;hp=173c5daf1cbf801f06ed464bb3bfbee79f6b2c76;hpb=47577d1daa5da455e3883ed60c70875a6845233a;p=kivitendo-erp.git

diff --git a/SL/Controller/ImageUpload.pm b/SL/Controller/ImageUpload.pm
index 173c5daf1..18561e0e7 100644
--- a/SL/Controller/ImageUpload.pm
+++ b/SL/Controller/ImageUpload.pm
@@ -3,6 +3,8 @@ package SL::Controller::ImageUpload;
 use strict;
 use parent qw(SL::Controller::Base);
 
+use JSON qw(to_json);
+
 use SL::DB::Part;
 use SL::DB::Order;
 use SL::DB::DeliveryOrder;
@@ -28,12 +30,29 @@ sub action_upload_image {
   my ($self) = @_;
 
   $::request->layout->add_javascripts('kivi.File.js');
+  $::request->layout->add_javascripts('kivi.FileDB.js');
+  $::request->layout->add_javascripts('kivi.ImageUpload.js');
+
+  $self->render('image_upload/local_list');
+}
+
+sub action_resolve_object_by_number {
+  my ($self) = @_;
+
+  my $result = {
+    id          => $self->object->id,
+    description => $self->object->displayable_name,
+  };
 
-  $self->render('image_upload/form');
+  $self->render(\ to_json($result), { process => 0, type => 'json' });
 }
 
 ################# internal ###############
 
+sub accept_types {
+  "image/*"
+}
+
 sub init_object_type {
   $::form->{object_type} or die "need object type"
 }
@@ -48,7 +67,7 @@ sub init_object {
 
   return $manager->find_by(id => $::form->{object_id}*1) if $::form->{object_id};
 
-  return $manager->find_by(donumber => $::form->{object_number}, @{ $loader->[1] // [] }) if $::form->{object_number};
+  return $manager->find_by(donumber => $::form->{object_number}, closed => 0, @{ $loader->[1] // [] }) if $::form->{object_number};
 }