From 2811964f01c24e81943fa699c8c397b22064f73d Mon Sep 17 00:00:00 2001
From: Mike Ng <mike.esokia@gmail.com>
Date: Wed, 13 Dec 2017 12:51:08 +0400
Subject: [PATCH 1/2] PORT PHRAS-1301/PHRAS-1676 to 4.1

---
 templates/web/prod/upload/upload-flash.html.twig |  5 +++--
 templates/web/prod/upload/upload.html.twig       | 15 ++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/templates/web/prod/upload/upload-flash.html.twig b/templates/web/prod/upload/upload-flash.html.twig
index c0d801df55..f912f72a64 100644
--- a/templates/web/prod/upload/upload-flash.html.twig
+++ b/templates/web/prod/upload/upload-flash.html.twig
@@ -54,11 +54,12 @@
                         <h5>{{ 'upload:: Destination (collection) :' | trans }} :</h5>
                         {# collections list #}
                         {% if collections|length > 0 %}
-                            <select name="base_id" class="span3" style="margin-left: 10px;">
+                            {% set last_used_collection = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'upload_last_used_collection') %}
+                            <select name="base_id" class="span3 upload-options-collection" style="margin-left: 10px;">
                             {% for  sbasId, availableCollections in collections %}
                                 <optgroup label="{{ availableCollections['databox'].get_label(app['locale']) }}" class="select-label">
                                 {% for collection in availableCollections['databox_collections'] %}
-                                    <option value="{{ collection.get_base_id() }}" class="select-row">{{ collection.get_label(app['locale']) }}</option>
+                                    <option {% if last_used_collection == collection.get_base_id() %} selected="selected" {% endif %} value="{{ collection.get_base_id() }}" class="select-row">{{ collection.get_label(app['locale']) }}</option>
                                 {% endfor %}
                                 </optgroup>
                             {% endfor %}
diff --git a/templates/web/prod/upload/upload.html.twig b/templates/web/prod/upload/upload.html.twig
index 1e5d5a1565..325b58b101 100644
--- a/templates/web/prod/upload/upload.html.twig
+++ b/templates/web/prod/upload/upload.html.twig
@@ -55,14 +55,15 @@
                         <div class='settings-box'>
                             <h5>{{ 'upload:: Destination (collection) :' | trans }} :</h5>
                             {# collections list #}
-                            <select name="base_id" class="span3" style="margin-left: 10px;">
-                            {% for  sbasId, availableCollections in collections %}
-                                <optgroup label="{{ availableCollections['databox'].get_label(app['locale']) }}" class="select-label">
-                                {% for collection in availableCollections['databox_collections'] %}
-                                    <option value="{{ collection.get_base_id() }}" class="select-row">{{ collection.get_label(app['locale']) }}</option>
+                            {% set last_used_collection = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'upload_last_used_collection') %}
+                            <select name="base_id" class="span3 upload-options-collection" style="margin-left: 10px;">
+                                {% for  sbasId, availableCollections in collections %}
+                                    <optgroup label="{{ availableCollections['databox'].get_label(app['locale']) }}" class="select-label">
+                                        {% for collection in availableCollections['databox_collections'] %}
+                                            <option {% if last_used_collection == collection.get_base_id() %} selected="selected" {% endif %} value="{{ collection.get_base_id() }}" class="select-row">{{ collection.get_label(app['locale']) }}</option>
+                                        {% endfor %}
+                                    </optgroup>
                                 {% endfor %}
-                                </optgroup>
-                            {% endfor %}
                             </select>
                             {# collections status #}
                             {% for availableCollections in collections %}

From 9c3f65f3f7f92362f0596c990aa38eccbb39e407 Mon Sep 17 00:00:00 2001
From: Mike Ng <mike.esokia@gmail.com>
Date: Thu, 21 Dec 2017 16:50:21 +0400
Subject: [PATCH 2/2] load appropriate status based on store collection

---
 templates/web/prod/upload/upload-flash.html.twig | 2 +-
 templates/web/prod/upload/upload.html.twig       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/web/prod/upload/upload-flash.html.twig b/templates/web/prod/upload/upload-flash.html.twig
index f912f72a64..f59d0ffadb 100644
--- a/templates/web/prod/upload/upload-flash.html.twig
+++ b/templates/web/prod/upload/upload-flash.html.twig
@@ -67,7 +67,7 @@
                             {# collections status #}
                             {% for availableCollections in collections %}
                                 {% for collection in availableCollections['databox_collections'] %}
-                                    <div id="status-{{ collection.get_base_id() }}" class='collection-status' style='{{ loop.parent.loop.first and loop.first ? "display:block" :"display:none" }}'>
+                                    <div id="status-{{ collection.get_base_id() }}" class='collection-status' style='{{ last_used_collection == collection.get_base_id() ? "display:block" :"display:none" }}'>
                                         <h5>{{ 'upload:: Status :' | trans }} :</h5>
                                         <table class="status-tab">
                                             <tbody>
diff --git a/templates/web/prod/upload/upload.html.twig b/templates/web/prod/upload/upload.html.twig
index 325b58b101..8a23c0d233 100644
--- a/templates/web/prod/upload/upload.html.twig
+++ b/templates/web/prod/upload/upload.html.twig
@@ -68,7 +68,7 @@
                             {# collections status #}
                             {% for availableCollections in collections %}
                                 {% for collection in availableCollections['databox_collections'] %}
-                                    <div id="status-{{ collection.get_base_id() }}" class='collection-status' style='{{ loop.parent.loop.first and loop.first ? "display:block" :"display:none" }}'>
+                                    <div id="status-{{ collection.get_base_id() }}" class='collection-status' style='{{ last_used_collection == collection.get_base_id() ? "display:block" :"display:none" }}'>
                                         <h5>{{ 'upload:: Status :' | trans }} :</h5>
                                         <table class="status-tab">
                                             <tbody>