Artikelstammdaten: kein Redirect auf »neuen Artikel anlegen«

Kommt man aus der Artikelsuche oder legt man einen neuen Artikel an,
so wird beim Speichern nun kein Redirect mehr auf die Suchliste
bzw. die Maske zum Neuanlegen eines Artikels gemacht, sondern auf die
Bearbeiten-Maske des Artikels, der gerade bearbeitet bzw. angelegt
wurde. Man bleibt also sozusagen im Artikel, den man gerade in der
Hand hatte.

Existierende Callbacks werden weiterhin honoriert, sprich kommt man
aus anderen Masken, so kommt man beim Speichern auch in die andere
Maske zurück.

diff --git a/SL/Controller/Part.pm b/SL/Controller/Part.pm
index 461090bd9d99ce3b5b3f29fcf65b7786ee8f0742..66f873136d838e6b90103e852f22a7d2beb50e97 100644 (file)
--- a/SL/Controller/Part.pm
+++ b/SL/Controller/Part.pm
@@ -42,7 +42,6 @@ __PACKAGE__->run_before('check_part_id', only   => [ qw(edit delete) ]);
 sub action_add_part {
   my ($self, %params) = @_;
 
-  $::form->{callback} = $self->url_for(action => 'add_part') unless $::form->{callback};
   $self->part( SL::DB::Part->new_part );
   $self->add;
 };
@@ -50,7 +49,6 @@ sub action_add_part {
 sub action_add_service {
   my ($self, %params) = @_;
 
-  $::form->{callback} = $self->url_for(action => 'add_service') unless $::form->{callback};
   $self->part( SL::DB::Part->new_service );
   $self->add;
 };
@@ -58,7 +56,6 @@ sub action_add_service {
 sub action_add_assembly {
   my ($self, %params) = @_;
 
-  $::form->{callback} = $self->url_for(action => 'add_assembly') unless $::form->{callback};
   $self->part( SL::DB::Part->new_assembly );
   $self->add;
 };
@@ -66,7 +63,6 @@ sub action_add_assembly {
 sub action_add_assortment {
   my ($self, %params) = @_;
 
-  $::form->{callback} = $self->url_for(action => 'add_assortment') unless $::form->{callback};
   $self->part( SL::DB::Part->new_assortment );
   $self->add;
 };
@@ -194,11 +190,7 @@ sub action_delete {
   if ( $::form->{callback} ) {
     $self->redirect_to($::form->unescape($::form->{callback}));
   } else {
-    my @redirect_params = (
-        controller => 'controller.pl',
-        action     => 'LoginScreen/user_login'
-    );
-    $self->redirect_to(@redirect_params);
+    $self->redirect_to(controller => 'ic.pl', action => 'search', searchitems => 'article');
   }
 }
 

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index d4ad5f14f7949acd84b860dba113a89ac50d864b..784cc1ad237a8b7bec6347fc3abf8ee3430b8177 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -500,7 +500,7 @@ sub generate_report {
       $soldtotal                  = 0 if ($form->{sold});
     }
 
-    my $edit_link               = build_std_url('script=controller.pl', 'action=Part/edit', 'part.id=' . E($ref->{id}), 'callback');
+    my $edit_link               = build_std_url('script=controller.pl', 'action=Part/edit', 'part.id=' . E($ref->{id}));
     $row->{partnumber}->{link}  = $edit_link;
     $row->{description}->{link} = $edit_link;
 

diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html
index c77568072b76cf9430892cab2b2c1bcb1446c4b2..e4996d363428dce241413e53fa981f0e87a42eaf 100644 (file)
--- a/templates/webpages/ic/search.html
+++ b/templates/webpages/ic/search.html
@@ -4,6 +4,7 @@
 [%- USE L %]
 [%- USE P %]
 [% SET style="width: 250px" %]
+[%- PROCESS 'common/flash.html' %]
 <h1>[% title %]</h1>
 
  <form method="post" action="ic.pl" id="form">