From 7a3b186a0c443cf839c58a32b6a81c8430fb8bcc Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Mon, 3 Jun 2019 21:51:59 +1000 Subject: [PATCH] Fix double loading of modals.html --- InvenTree/build/templates/build/build_base.html | 2 -- InvenTree/build/templates/build/index.html | 2 -- InvenTree/company/templates/company/company_base.html | 2 -- InvenTree/company/templates/company/index.html | 4 ---- InvenTree/company/templates/company/partdetail.html | 4 ---- InvenTree/part/templates/part/part_base.html | 2 -- InvenTree/stock/templates/stock/location.html | 2 -- InvenTree/stock/templates/stock/tracking.html | 2 -- 8 files changed, 20 deletions(-) diff --git a/InvenTree/build/templates/build/build_base.html b/InvenTree/build/templates/build/build_base.html index 7cb5a2d659..83a89de7c4 100644 --- a/InvenTree/build/templates/build/build_base.html +++ b/InvenTree/build/templates/build/build_base.html @@ -81,8 +81,6 @@ InvenTree | Build - {{ build }} -{% include "modals.html" %} - {% endblock %} {% block js_ready %} diff --git a/InvenTree/build/templates/build/index.html b/InvenTree/build/templates/build/index.html index d52bcb4c4a..3c9eda3544 100644 --- a/InvenTree/build/templates/build/index.html +++ b/InvenTree/build/templates/build/index.html @@ -29,8 +29,6 @@ InvenTree | Build List {% include "build/build_list.html" with builds=cancelled title="Cancelled Builds" completed=False collapse_id="cancelled" %} -{% include 'modals.html' %} - {% endblock %} {% block js_ready %} diff --git a/InvenTree/company/templates/company/company_base.html b/InvenTree/company/templates/company/company_base.html index 8c64190865..6de8d83bbb 100644 --- a/InvenTree/company/templates/company/company_base.html +++ b/InvenTree/company/templates/company/company_base.html @@ -68,8 +68,6 @@ InvenTree | Company - {{ company.name }} -{% include 'modals.html' %} - {% endblock %} {% block js_load %} diff --git a/InvenTree/company/templates/company/index.html b/InvenTree/company/templates/company/index.html index 54a9d53213..84fd85732e 100644 --- a/InvenTree/company/templates/company/index.html +++ b/InvenTree/company/templates/company/index.html @@ -26,10 +26,6 @@ InvenTree | Supplier List
- - -{% include 'modals.html' %} - {% endblock %} {% block js_ready %} {{ block.super }} diff --git a/InvenTree/company/templates/company/partdetail.html b/InvenTree/company/templates/company/partdetail.html index ab4a369469..dd43d0c5e4 100644 --- a/InvenTree/company/templates/company/partdetail.html +++ b/InvenTree/company/templates/company/partdetail.html @@ -103,10 +103,6 @@ InvenTree | {{ company.name }} - Parts
- - -{% include 'modals.html' %} - {% endblock %} {% block js_ready %} diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html index 1354a9a4a4..9c68cfe69f 100644 --- a/InvenTree/part/templates/part/part_base.html +++ b/InvenTree/part/templates/part/part_base.html @@ -109,8 +109,6 @@ {% endblock %} -{% include 'modals.html' %} - {% endblock %} {% block js_ready %} diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html index b165eaa72a..987d433104 100644 --- a/InvenTree/stock/templates/stock/location.html +++ b/InvenTree/stock/templates/stock/location.html @@ -46,8 +46,6 @@ {% include "stock_table.html" %} -{% include 'modals.html' %} - {% endblock %} {% block js_load %} diff --git a/InvenTree/stock/templates/stock/tracking.html b/InvenTree/stock/templates/stock/tracking.html index 9ba4b290df..ecd9772897 100644 --- a/InvenTree/stock/templates/stock/tracking.html +++ b/InvenTree/stock/templates/stock/tracking.html @@ -8,8 +8,6 @@
-{% include 'modals.html' %} - {% endblock %} {% block js_ready %}