Merge

History.md

@@ -21,6 +21,7 @@ This release was mainly sponsored by the [German Federal Youth Council](http://w
 
 ### Version 3.6.10 [not released yet]
 
+- Bugfix: Merging a single amendment into a motion could crash the system if a new paragraph was inserted.
 - Bugfix: After rewriting an amendment while merging another amendment into th emotion, it could not be edited anymore, as the text as been empty 
 
 ### Version 3.6.9 (2017-06-05)

models/forms/MergeSingleAmendmentForm.php

@@ -151,6 +151,7 @@ private function createNewMotionSections()
             $newSection = new MotionSection();
             $newSection->setAttributes($section->getAttributes(), false);
             $newSection->motionId = $this->newMotion->id;
+            $newSection->cache = '';
             if ($section->getSettings()->type == ISectionType::TYPE_TEXT_SIMPLE) {
                 if (isset($newSections[$section->sectionId])) {
                     $newSection->data    = $newSections[$section->sectionId];

views/amendment/_merge_step1.php

@@ -7,6 +7,7 @@
 /**
  * @var Amendment $amendment
  * @var bool $allowStatusChanging
+ * @var Amendment[] $otherAmendments
  */
 
 ?>
@@ -50,12 +51,12 @@
 
             <?php
             foreach ($otherAmendments as $otherAmend) {
-                echo '<div class="row"><div class="col-md-3">';
+                echo '<div class="row"><div class="col-md-5">';
                 echo HTMLTools::amendmentDiffTooltip($otherAmend, 'bottom');
                 echo Html::a($otherAmend->getTitle(), UrlHelper::createAmendmentUrl($otherAmend));
                 echo '<span class="by">' . \Yii::t('amend', 'merge1_amend_by') . ': ' .
                     $otherAmend->getInitiatorsStr() . '</span>';
-                echo '</div><div class="col-md-9"><div class="fueluxSelectHolder">';
+                echo '</div><div class="col-md-7"><div class="fueluxSelectHolder">';
                 $statiAll = $amendment->getStati();
                 $stati    = [];
                 foreach (Amendment::getStatiMarkAsDoneOnRewriting() as $statusId) {