RecordLinks: Anzeige etwas verbessert

diff --git a/SL/Controller/RecordLinks.pm b/SL/Controller/RecordLinks.pm
index ea0c7782b9d39476d1693d108c02e05fc99aa99b..08a95bd8b92313fb8d7f5a06ce1c0e80dc7c26af 100644 (file)
--- a/SL/Controller/RecordLinks.pm
+++ b/SL/Controller/RecordLinks.pm
@@ -53,7 +53,7 @@ sub action_ajax_list {
   my ($self) = @_;
 
   eval {
   my ($self) = @_;
 
   eval {

-    my $linked_records = $self->object->linked_records(direction => 'both', recursive => 1);
+    my $linked_records = $self->object->linked_records(direction => 'both', recursive => 1, save_path => 1);

     push @{ $linked_records }, $self->object->sepa_export_items if $self->object->can('sepa_export_items');
     my $output         = SL::Presenter->get->grouped_record_list(
       $linked_records,
     push @{ $linked_records }, $self->object->sepa_export_items if $self->object->can('sepa_export_items');
     my $output         = SL::Presenter->get->grouped_record_list(
       $linked_records,

diff --git a/SL/DB/Helper/LinkedRecords.pm b/SL/DB/Helper/LinkedRecords.pm
index b75597abb0881ed30b25b4f36429ff832cc2a8bb..cca9fe3c1e3e5ec4d98254eb5e66b73c0ccde885 100644 (file)
--- a/SL/DB/Helper/LinkedRecords.pm
+++ b/SL/DB/Helper/LinkedRecords.pm
@@ -154,8 +154,11 @@ sub _linked_records_implementation {
     if ($params{save_path}) {
        my %links_by_id = map { $_->{id} => $_ } @$links;
        for (@objects) {
     if ($params{save_path}) {
        my %links_by_id = map { $_->{id} => $_ } @$links;
        for (@objects) {

-         $_->{_record_link_path}  = $links_by_id{$_->{_record_link}->id}->{path};
-         $_->{_record_link_depth} = $links_by_id{$_->{_record_link}->id}->{depth};
+         my $link = $links_by_id{$_->{_record_link}->id};
+         my $intermediate_links = SL::DB::Manager::RecordLink->get_all(query => [ id => $link->{path} ]);
+         $_->{_record_link_path}     = $link->{path};
+         $_->{_record_link_obj_path} = [ map { $get_objects->($_) } @$intermediate_links ];
+         $_->{_record_link_depth}    = $link->{depth};

        }
     }
 
        }
     }
 

diff --git a/SL/Presenter/Record.pm b/SL/Presenter/Record.pm
index 2bbaaf61132fb6078aa85f49dc0b4587aad5b824..368a05d7caed4bcc832c91fb638ee211e5cb345d 100644 (file)
--- a/SL/Presenter/Record.pm
+++ b/SL/Presenter/Record.pm
@@ -75,7 +75,12 @@ sub record_list {
   if ($with_columns{record_link_direction}) {
     push @columns, {
       title => $::locale->text('Link direction'),
   if ($with_columns{record_link_direction}) {
     push @columns, {
       title => $::locale->text('Link direction'),

-      data  => sub { $_[0]->{_record_link_direction} eq 'from' ? $::locale->text('Row was source for current record') : $::locale->text('Row was created from current record') },
+      data  => sub {
+          $_[0]->{_record_link_depth} > 1
+        ? $::locale->text('Row was linked to another record')
+        : $_[0]->{_record_link_direction} eq 'from'
+        ? $::locale->text('Row was source for current record')
+        : $::locale->text('Row was created from current record') },

     };
   }
 
     };
   }
 

diff --git a/locale/de/all b/locale/de/all
index 9c2a9fc17235f10a91a5bf57f402d3c19a3d162b..56d5255d80351b30efc86b07bc457b16916f3081 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1964,6 +1964,7 @@ $self->{texts} = {
   'Row #1: amount has to be different from zero.' => 'Zeile #1: Der Wert darf nicht 0 sein.',
   'Row number'                  => 'Zeilennummer',
   'Row was created from current record' => 'Zeile wurde aus aktuellem Beleg erstellt',
   'Row #1: amount has to be different from zero.' => 'Zeile #1: Der Wert darf nicht 0 sein.',
   'Row number'                  => 'Zeilennummer',
   'Row was created from current record' => 'Zeile wurde aus aktuellem Beleg erstellt',

+  'Row was linked to another record' => 'Zeile wurde über einen anderen Beleg verlinkt',

   'Row was source for current record' => 'Zeile war Quelle für aktuellen Beleg',
   'Run at'                      => 'Ausgeführt um',
   'SAVED'                       => 'Gespeichert',
   'Row was source for current record' => 'Zeile war Quelle für aktuellen Beleg',
   'Run at'                      => 'Ausgeführt um',
   'SAVED'                       => 'Gespeichert',