From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 18 Aug 2016 09:45:09 +0000 (+0200)
Subject: Merge branch 'f-use-with_transaction-instead-of-do_transaction'
X-Git-Tag: release-3.5.4~2127
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/0b84f51fd598e4b5a1cb139aa582297d089b1602?hp=96670fe82a38116ac10592a6ccbd34800f8ad9f8

Merge branch 'f-use-with_transaction-instead-of-do_transaction'
---

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 480f8915b..89c7ded25 100644
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -93,7 +93,7 @@ sub action_delete {
 
   flash_later('info', $::locale->text('The order has been deleted'));
   my @redirect_params = (
-    action => 'edit',
+    action => 'add',
     type   => $self->type,
   );
 
diff --git a/SL/Controller/RequirementSpecItem.pm b/SL/Controller/RequirementSpecItem.pm
index d32d28481..b74ebefd0 100644
--- a/SL/Controller/RequirementSpecItem.pm
+++ b/SL/Controller/RequirementSpecItem.pm
@@ -94,14 +94,14 @@ sub action_dragged_and_dropped {
     $self->item->add_to_list(position => $position, reference => $::form->{dropped_id} || undef);
   });
 
-  $self->item(SL::DB::RequirementSpecItem->new(id => $self->item->id)->load);
-  my $new_section         = $self->item->section;
-  my $new_visible_section = SL::DB::RequirementSpecItem->new(id => $self->visible_item->id)->load->section;
-
   return $self->invalidate_version->render if !$old_visible_section || ($new_type eq 'section');
 
   # From here on $old_visible_section is definitely set.
 
+  $self->item(SL::DB::RequirementSpecItem->new(id => $self->item->id)->load);
+  my $new_section         = $self->item->section;
+  my $new_visible_section = SL::DB::RequirementSpecItem->new(id => $self->visible_item->id)->load->section;
+
   my $old_parent  = SL::DB::RequirementSpecItem->new(id => $old_parent_id)->load;
   my $old_section = $old_parent->section;
 
diff --git a/doc/changelog b/doc/changelog
index af06fff6f..e0ab63a72 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -24,6 +24,13 @@ Administrative Änderungen
     beschleunigt. Dafür wird die benötigte Minimalversion von Postgres auf 9.1
     angehoben.
 
+Bugfixes:
+
+  - Pflichtenheftmodul: Es wurde eine Fehlermeldung angezeigt, wenn im
+    rechten Teil des Fensters aktuell Textblöcke zu sehen sind,
+    während Abschnitte oder Funktionsblöcke via Drag & Drop verschoben
+    wurden.
+
 2016-07-05 - Release 3.4.1
 
 kleinere neue Features und Detailverbesserungen: