From ec9603fbe14bd62d241b48c13d45911ce4bd9c4b Mon Sep 17 00:00:00 2001
From: Vitaly <v.zadorozhny@infomir.com>
Date: Thu, 4 Oct 2018 14:16:42 +0300
Subject: [PATCH] Import m3u: auto select genre from file (#19240)

---
 .../views/default/TvChannels/m3u_import/m3u_import.js.twig |  2 ++
 .../views/default/TvChannels/m3u_import/m3u_import.twig    | 14 ++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/admin/resources/views/default/TvChannels/m3u_import/m3u_import.js.twig b/admin/resources/views/default/TvChannels/m3u_import/m3u_import.js.twig
index a2f7d2e2c..ed2ed6572 100644
--- a/admin/resources/views/default/TvChannels/m3u_import/m3u_import.js.twig
+++ b/admin/resources/views/default/TvChannels/m3u_import/m3u_import.js.twig
@@ -1,5 +1,6 @@
 
         var select2Opt = {minimumResultsForSearch: -1, dropdownAutoWidth: false, width: '100%'};
+        var allGenres = {% autoescape false %}{{ app.allGenres | json_encode() }}{% endautoescape %};
         var sendedPic = [];
         var conf = {
             lang : '{{ app.js_validator_language }}',
@@ -236,6 +237,7 @@
                     var item = this;
                     item['item_number'] = i;
                     item['number'] = (free_number_exists && i < auto_fill) ? last_channel_number + i + 1: '';
+                    item['allGenres'] = allGenres;
                     item['logo_name'] = '';
                     if (item['logo'] != '') {
                         item['logo_name'] = item['logo'].split('/').pop();
diff --git a/admin/resources/views/default/TvChannels/m3u_import/m3u_import.twig b/admin/resources/views/default/TvChannels/m3u_import/m3u_import.twig
index 6d16900af..f40515175 100644
--- a/admin/resources/views/default/TvChannels/m3u_import/m3u_import.twig
+++ b/admin/resources/views/default/TvChannels/m3u_import/m3u_import.twig
@@ -132,17 +132,15 @@
                                 <div class="form-group">
                                     <span class="help-inline">
                                         <span class=" txt-default">{{ 'Genre'|trans }}</span>
-                                        {{ "{{if genre}}" }}
-                                        <span class=" txt-default">({{ 'from file'|trans }}: "${genre}")</span>
-                                        {{ "{{/if}}" }}
                                     </span>
                                     <select class="populate placeholder own_field" name="tv_genre_id" data-validation="required" id="channel_s2_${item_number}">
-                                        {% if app['allGenres'] %}
-                                            {% for s_item in app.allGenres %}
-                                                <option value="{{ s_item.id }}">{{ s_item.title }}</option>
-                                            {% endfor %}
-                                        {% endif %}
+                                        {{ "{{each allGenres}}" }}
+                                            <option value="{{ "${id}" }}" {{ "{{if title.toUpperCase()==genre.toUpperCase()}}" }}selected{{ "{{/if}}" }}>{{ "${title}" }}</option>
+                                        {{ "{{/each}}" }}
                                     </select>
+                                    {{ "{{if genre}}" }}
+                                        <span class=" txt-default">({{ 'from file'|trans }}: "${genre}")</span>
+                                    {{ "{{/if}}" }}
                                 </div>
                             </div>
                             <div class="col-xs-5 no-padding-right">
-- 
2.14.1.windows.1