From f900c842cbf13d693cc3c91523ea888dce0c34f5 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Mon, 17 Jul 2017 16:12:07 +0200
Subject: [PATCH] Improve "copy from above"

---
 .../event/checkout_questions.html             | 14 +++++++------
 src/pretix/static/pretixpresale/js/ui/main.js | 20 +++++++++++--------
 .../static/pretixpresale/scss/_forms.scss     |  4 ++++
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
index 1a5b52983..179158e30 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html
@@ -53,13 +53,15 @@
                                 {% if pos.variation %}
                                     – {{ pos.variation }}
                                 {% endif %}
-                                <i class="fa fa-angle-down collapse-indicator"></i>
+                                {% if forloop.counter > 1 %}
+                                    <span class="text-right">
+                                        <input type="button" data-id="{{ forloop.counter0 }}" name="copy" class="js-copy-answers btn btn-default btn-xs" value='{% trans "Copy answers from above" %}'>
+                                        <i class="fa fa-angle-down collapse-indicator"></i>
+                                    </span>
+                                {% else %}
+                                    <i class="fa fa-angle-down collapse-indicator"></i>
+                                {% endif %}
                             </a>
-                            {% if forloop.counter > 1 %}
-                                <span class="text-right pull-right">
-                                     <input type="button" data-id="{{ forloop.counter0 }}" name="copy" class="js-copy-answers btn btn-default btn-xs" value='{% trans "Copy answers from above" %}'>
-                                </span>
-                            {% endif %}
                         </h4>
                     </div>
                     <div id="cp{{ pos.id }}"
diff --git a/src/pretix/static/pretixpresale/js/ui/main.js b/src/pretix/static/pretixpresale/js/ui/main.js
index 69be44c7f..92041fd92 100644
--- a/src/pretix/static/pretixpresale/js/ui/main.js
+++ b/src/pretix/static/pretixpresale/js/ui/main.js
@@ -51,8 +51,10 @@ $(function () {
     // Copy answers
     $(".js-copy-answers").click(function (e) {
         e.preventDefault();
+        e.stopPropagation();
         var idx = $(this).data('id');
         copy_answers(idx);
+        return false;
     });
 
     // Subevent choice
@@ -98,31 +100,33 @@ function copy_answers(idx) {
     elements.each(function(index){
         var input = $(this),
             tagName = input.prop('tagName').toLowerCase(),
-            attributeType = input.attr('type');
+            attributeType = input.attr('type'),
+            suffix = input.attr('name').split('-')[1];
+
 
         switch (tagName) {
-            case "textarea":            
-                input.val(firstAnswers.eq(index).val());
+            case "textarea":
+                input.val(firstAnswers.filter("[name$=" + suffix + "]").val());
                 break;
             case "select":
-                input.val(firstAnswers.eq(index).find(":selected").val()).change();
+                input.val(firstAnswers.filter("[name$=" + suffix + "]").find(":selected").val()).change();
                 break;
             case "input":
                 switch (attributeType) {
                     case "text":
                     case "number":
-                        input.val(firstAnswers.eq(index).val());
+                        input.val(firstAnswers.filter("[name$=" + suffix + "]").val());
                         break;
                     case "checkbox":
                     case "radio":
-                        input.prop("checked", firstAnswers.eq(index).prop("checked"));
+                        input.prop("checked", firstAnswers.filter("[name$=" + suffix + "]").prop("checked"));
                         break;
                     default:
-                        input.val(firstAnswers.eq(index).val());
+                        input.val(firstAnswers.filter("[name$=" + suffix + "]").val());
                 } 
                 break;
             default:
-                input.val(firstAnswers.eq(index).val());
+                input.val(firstAnswers.filter("[name$=" + suffix + "]").val());
         } 
     });
 }
diff --git a/src/pretix/static/pretixpresale/scss/_forms.scss b/src/pretix/static/pretixpresale/scss/_forms.scss
index 4800f5c81..9418a800c 100644
--- a/src/pretix/static/pretixpresale/scss/_forms.scss
+++ b/src/pretix/static/pretixpresale/scss/_forms.scss
@@ -16,6 +16,10 @@
   pointer-events: none;
 }
 
+.js-copy-answers {
+  margin-right: 10px;
+}
+
 .form-control.is-focused {
   @extend .form-control:focus;
 }