From 3202480c7b85458a0ece7ab7b0bb4bd75c5d14d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?=
 <mauriciofauth@gmail.com>
Date: Wed, 29 Nov 2017 20:45:58 -0200
Subject: [PATCH] Move partial_import_option.twig into import.twig
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
---
 templates/display/import/import.twig          | 40 +++++++++++++++++--
 .../display/import/partial_import_option.twig | 36 -----------------
 2 files changed, 36 insertions(+), 40 deletions(-)
 delete mode 100644 templates/display/import/partial_import_option.twig

diff --git a/templates/display/import/import.twig b/templates/display/import/import.twig
index 209eb2edaf..054f6a6608 100644
--- a/templates/display/import/import.twig
+++ b/templates/display/import/import.twig
@@ -51,10 +51,42 @@
             'disable_is': disable_is
         } only %}
 
-        {% include 'display/import/partial_import_option.twig' with {
-            'timeout_passed': timeout_passed,
-            'offset': offset
-        } only %}
+        <div class="importoptions">
+            <h3>{% trans 'Partial import:' %}</h3>
+
+            {% if timeout_passed is defined and timeout_passed %}
+                <div class="formelementrow">
+                    <input type="hidden" name="skip" value="{{ offset }}" />
+                    {{ 'Previous import timed out, after resubmitting will continue from position %d.'|trans|format(offset) }}
+                </div>
+            {% endif %}
+
+            <div class="formelementrow">
+                <input type="checkbox" name="allow_interrupt" value="yes" id="checkbox_allow_interrupt"
+                    {{ Plugins_checkboxCheck('Import', 'allow_interrupt') }} />
+                <label for="checkbox_allow_interrupt">
+                    {% trans 'Allow the interruption of an import in case the script detects it is close to the PHP timeout limit. <em>(This might be a good way to import large files, however it can break transactions.)</em>' %}
+                </label>
+            </div>
+
+            {% if not (timeout_passed is defined and timeout_passed) %}
+                <div class="formelementrow">
+                    <label for="text_skip_queries">
+                        {% trans 'Skip this number of queries (for SQL) starting from the first one:' %}
+                    </label>
+                    <input type="number" name="skip_queries" value="
+                        {{- Plugins_getDefault('Import', 'skip_queries') -}}
+                        " id="text_skip_queries" min="0" />
+                </div>
+            {% else %}
+                {# If timeout has passed,
+                   do not show the Skip dialog to avoid the risk of someone
+                   entering a value here that would interfere with "skip" #}
+                <input type="hidden" name="skip_queries" value="
+                    {{- Plugins_getDefault('Import', 'skip_queries') -}}
+                    " id="text_skip_queries" />
+            {% endif %}
+        </div>
 
         <div class="importoptions">
             <h3>{% trans 'Other options:' %}</h3>
diff --git a/templates/display/import/partial_import_option.twig b/templates/display/import/partial_import_option.twig
deleted file mode 100644
index a454293630..0000000000
--- a/templates/display/import/partial_import_option.twig
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="importoptions">
-    <h3>{% trans 'Partial import:' %}</h3>
-
-    {% if timeout_passed is defined and timeout_passed %}
-        <div class="formelementrow">
-            <input type="hidden" name="skip" value="{{ offset }}" />
-            {{ 'Previous import timed out, after resubmitting will continue from position %d.'|trans|format(offset) }}
-        </div>
-    {% endif %}
-
-    <div class="formelementrow">
-        <input type="checkbox" name="allow_interrupt" value="yes" id="checkbox_allow_interrupt"
-            {{ Plugins_checkboxCheck('Import', 'allow_interrupt') }} />
-        <label for="checkbox_allow_interrupt">
-            {% trans 'Allow the interruption of an import in case the script detects it is close to the PHP timeout limit. <em>(This might be a good way to import large files, however it can break transactions.)</em>' %}
-        </label>
-    </div>
-
-    {% if not (timeout_passed is defined and timeout_passed) %}
-        <div class="formelementrow">
-            <label for="text_skip_queries">
-                {% trans 'Skip this number of queries (for SQL) starting from the first one:' %}
-            </label>
-            <input type="number" name="skip_queries" value="
-                {{- Plugins_getDefault('Import', 'skip_queries') -}}
-                " id="text_skip_queries" min="0" />
-        </div>
-    {% else %}
-        {# If timeout has passed,
-           do not show the Skip dialog to avoid the risk of someone
-           entering a value here that would interfere with "skip" #}
-        <input type="hidden" name="skip_queries" value="
-            {{- Plugins_getDefault('Import', 'skip_queries') -}}
-            " id="text_skip_queries" />
-    {% endif %}
-</div>