From 16aa30cd56e87ada372fbf4c6a69ed3d18c388b6 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Tue, 13 Jun 2017 21:49:54 +1000
Subject: [PATCH 1/2] Fix #13350 Add Index issue

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 templates/table/index_form.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/table/index_form.twig b/templates/table/index_form.twig
index 4b7e6ed314..04877ec2c1 100644
--- a/templates/table/index_form.twig
+++ b/templates/table/index_form.twig
@@ -167,7 +167,7 @@
                     </tr>
                 {% endfor %}
                 {% if add_fields > 0 %}
-                    {% for i in range(0, add_fields) %}
+                    {% for i in range(1, add_fields) %}
                         <tr class="noclick">
                             <td>
                                 <span class="drag_icon" title="{% trans 'Drag to reorder' %}"></span>

From f0f9311cf5a0f3a09181620fffbe1986ba50939a Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Tue, 13 Jun 2017 22:06:32 +1000
Subject: [PATCH 2/2] Fix div id. Use the jQuery UI dialog for index creation

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/indexes.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/indexes.js b/js/indexes.js
index 6683ad7998..f317a2ce43 100644
--- a/js/indexes.js
+++ b/js/indexes.js
@@ -528,7 +528,7 @@ AJAX.registerTeardown('indexes.js', function () {
     $(document).off('click', '#preview_index_frm');
     $(document).off('change', '#select_index_choice');
     $(document).off('click', 'a.drop_primary_key_index_anchor.ajax');
-    $(document).off('click', "#table_index tbody tr td.edit_index.ajax, #indexes .add_index.ajax");
+    $(document).off('click', "#table_index tbody tr td.edit_index.ajax, #index_div .add_index.ajax");
     $(document).off('click', '#index_frm input[type=submit]');
     $('body').off('change', 'select[name*="field_key"]');
     $(document).off('click', '.show_index_dialog');
@@ -652,7 +652,7 @@ AJAX.registerOnload('indexes.js', function () {
     /**
      *Ajax event handler for index edit
     **/
-    $(document).on('click', "#table_index tbody tr td.edit_index.ajax, #indexes .add_index.ajax", function (event) {
+    $(document).on('click', "#table_index tbody tr td.edit_index.ajax, #index_div .add_index.ajax", function (event) {
         event.preventDefault();
         var url, title;
         if ($(this).find("a").length === 0) {