Merge branch 'pr/865' into develop

cookbook/templates/base.html

@@ -97,6 +97,9 @@
                     <a class="dropdown-item" href="{% url 'list_food' %}"><i
                             class="fas fa-leaf fa-fw"></i> {% trans 'Ingredients' %}
                     </a>
+                    <a class="dropdown-item" href="{% url 'list_unit' %}"><i
+                            class="fas fa-balance-scale fa-fw"></i> {% trans 'Units' %}
+                    </a>
                     <a class="dropdown-item" href="{% url 'view_supermarket' %}"><i
                             class="fas fa-store-alt fa-fw"></i> {% trans 'Supermarket' %}
                     </a>
@@ -114,6 +117,28 @@
                             class="fas fa-edit fa-fw"></i> {% trans 'Batch Edit' %}</a>
                 </div>
             </li>
+            {% comment %} should food and units be moved to the keyword dropdown and rename that?
+                    feels like the original intent of the organization of these menus has shifted maybe something like this?{% endcomment %}
+            <li class="nav-item dropdown {% if request.resolver_match.url_name in 'list_food,list_unit,list_keyword,data_batch_edit' %}active{% endif %}">
+                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
+                   aria-haspopup="true" aria-expanded="false">
+                    <i class="fas fa-blender"></i> {% trans 'Gadgets' %}
+                </a>
+                <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                    <a class="dropdown-item" href="{% url 'list_food' %}"><i
+                            class="fas fa-leaf fa-fw"></i> {% trans 'Ingredients' %}
+                    </a>
+                    <a class="dropdown-item" href="{% url 'list_unit' %}"><i
+                            class="fas fa-balance-scale fa-fw"></i> {% trans 'Units' %}
+                    </a>
+                    <a class="dropdown-item" href="{% url 'list_keyword' %}"><i
+                            class="fas fa-tags fa-fw"></i> {% trans 'Keyword' %}</a>
+                    {% comment %} does this funcionatliy need moved to the keyword list page? 
+                    the Recipe Search might be better? {% endcomment %}
+                    <a class="dropdown-item" href="{% url 'data_batch_edit' %}"><i
+                            class="fas fa-edit fa-fw"></i> {% trans 'Batch Edit' %}</a>
+                </div>
+            </li>
             <li class="nav-item dropdown {% if request.resolver_match.url_name in 'list_storage,data_sync,list_recipe_import,list_sync_log,data_stats,edit_food,edit_storage' %}active{% endif %}">
                 <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
                    aria-haspopup="true" aria-expanded="false"><i class="fas fa-database"></i> {% trans 'Storage Data' %}
@@ -129,8 +154,8 @@
                             class="fas fa-history fa-fw"></i> {% trans 'Discovery Log' %}</a>
                     <a class="dropdown-item" href="{% url 'data_stats' %}"><i
                             class="fas fa-chart-line fa-fw"></i> {% trans 'Statistics' %}</a>
-                    <a class="dropdown-item" href="{% url 'edit_food' %}"><i
-                            class="fas fa-balance-scale fa-fw"></i> {% trans 'Units & Ingredients' %}</a>
+                    {% comment %} <a class="dropdown-item" href="{% url 'edit_food' %}"><i
+                            class="fas fa-balance-scale fa-fw"></i> {% trans 'Units & Ingredients' %}</a> {% endcomment %}
                     <a class="dropdown-item" href="{% url 'data_import_url' %}"><i
                             class="fas fa-file-import"></i> {% trans 'Import Recipe' %}</a>
 

cookbook/templates/forms/edit_internal_recipe.html

@@ -766,7 +766,7 @@
                 searchUnits: function (query) {
                     this.units_loading = true
                     this.$http.get("{% url 'api:unit-list' %}" + '?query=' + query + '&limit=10').then((response) => {
-                        this.units = response.data;
+                        this.units = response.data.results;
 
                         if (this.recipe !== undefined) {
                             for (let s of this.recipe.steps) {

cookbook/templates/generic/model_template.html

@@ -2,9 +2,8 @@
 {% load render_bundle from webpack_loader %}
 {% load static %}
 {% load i18n %}
-{% load l10n %}
-{% comment %} TODO Can this be combined with Keyword template? {% endcomment %}
-{% block title %}{% trans 'Food' %}{% endblock %}
+{% comment %} {% load l10n %} {% endcomment %}
+{% block title %}{{ title }}{% endblock %}
 
 {% block content_fluid %}
 
@@ -17,6 +16,8 @@
 
 
 {% block script %}
+    {{ config | json_script:"model_config" }}
+    
     {% if debug %}
         <script src="{% url 'js_reverse' %}"></script>
     {% else %}
@@ -27,5 +28,5 @@
         window.IMAGE_PLACEHOLDER = "{% static 'assets/recipe_no_image.svg' %}"
     </script>
 
-    {% render_bundle 'food_list_view' %}
+    {% render_bundle 'model_list_view' %}
 {% endblock %}

cookbook/templates/model/keyword_template.html

@@ -1,31 +0,0 @@
-{% extends "base.html" %}
-{% load render_bundle from webpack_loader %}
-{% load static %}
-{% load i18n %}
-{% load l10n %}
-{% comment %} TODO Can this be combined with Food template? {% endcomment %}
-{% block title %}{% trans 'Keywords' %}{% endblock %}
-
-{% block content_fluid %}
-
-    <div id="app" >
-        <keyword-list-view></keyword-list-view>
-    </div>
-
-
-{% endblock %}
-
-
-{% block script %}
-    {% if debug %}
-        <script src="{% url 'js_reverse' %}"></script>
-    {% else %}
-        <script src="{% static 'django_js_reverse/reverse.js' %}"></script>
-    {% endif %}
-
-    <script type="application/javascript">
-        window.IMAGE_PLACEHOLDER = "{% static 'assets/recipe_no_image.svg' %}"
-    </script>
-
-    {% render_bundle 'keyword_list_view' %}
-{% endblock %}

cookbook/templates/shopping_list.html

@@ -908,7 +908,7 @@
                 searchKeywords: function (query) {
                     this.keywords_loading = true
                     this.$http.get("{% url 'api:keyword-list' %}" + '?query=' + query + '&limit=10').then((response) => {
-                        this.keywords = response.data;
+                        this.keywords = response.data.results;
                         this.keywords_loading = false
                     }).catch((err) => {
                         console.log(err)
@@ -919,7 +919,7 @@
                 searchUnits: function (query) { //TODO move to central component
                     this.units_loading = true
                     this.$http.get("{% url 'api:unit-list' %}" + '?query=' + query + '&limit=10').then((response) => {
-                        this.units = response.data;
+                        this.units = response.data.results;
                         this.units_loading = false
                     }).catch((err) => {
                         this.makeToast(gettext('Error'), gettext("There was an error loading a resource!") + err.bodyText, 'danger')
@@ -928,7 +928,7 @@
                 searchFoods: function (query) { //TODO move to central component
                     this.foods_loading = true
                     this.$http.get("{% url 'api:food-list' %}" + '?query=' + query + '&limit=10').then((response) => {
-                        this.foods = response.data
+                        this.foods = response.data.results
                         this.foods_loading = false
                     }).catch((err) => {
                         this.makeToast(gettext('Error'), gettext("There was an error loading a resource!") + err.bodyText, 'danger')