From f82b0c74ab9740fb8b176d705210b6f82b503c76 Mon Sep 17 00:00:00 2001
From: Saptak Sengupta <saptak013@gmail.com>
Date: Mon, 5 Aug 2019 15:52:36 +0530
Subject: [PATCH] Adds wagtail inventory to search wagtail pages based on the
 block type

---
 README.rst                    | 3 +++
 dev-requirements.txt          | 1 +
 devops/docker/django-start.sh | 3 +++
 docker-compose.yaml           | 1 +
 incident/models/export.py     | 1 +
 prod-docker-compose.yaml      | 1 +
 requirements.in               | 1 +
 requirements.txt              | 1 +
 tracker/settings/base.py      | 1 +
 9 files changed, 13 insertions(+)

diff --git a/README.rst b/README.rst
index 87b07fbbd..f8e666739 100644
--- a/README.rst
+++ b/README.rst
@@ -42,6 +42,9 @@ environment, run the following your first run:
     # Inject development data (also only needs to be run once)
     docker-compose exec django ./manage.py createdevdata
 
+    # Add wagtail inventory to search wagtail pages by block type
+    docker-compose exec django ./manage.py block_inventory
+
 You should be able to hit the web server interface by running ``make open-browser``
 
 Note: the ``createdevdata`` command fetches images from the internet
diff --git a/dev-requirements.txt b/dev-requirements.txt
index e8df364b4..24fcbb162 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -64,6 +64,7 @@ wagtail-autocomplete==0.3.1
 wagtail-django-recaptcha==1.0
 wagtail-factories==1.1.0
 wagtail-metadata==2.0.1
+wagtail-inventory==0.7
 wagtail==2.3
 wcwidth==0.1.7            # via prompt-toolkit
 webencodings==0.5.1
diff --git a/devops/docker/django-start.sh b/devops/docker/django-start.sh
index 127f3da64..f3deb0467 100644
--- a/devops/docker/django-start.sh
+++ b/devops/docker/django-start.sh
@@ -30,6 +30,9 @@ django_start() {
     if [ "${DJANGO_CREATEDEVDATA:-no}" == "yes" ]; then
         ./manage.py createdevdata
     fi
+    if [ "${DJANGO_CREATEINVENTORY:-no}" == "yes" ]; then
+        ./manage.py block_inventory
+    fi
     if [ "${DEPLOY_ENV}" == "dev" ]; then
         ./devops/scripts/version-file.sh
         ./manage.py runserver 0.0.0.0:8000
diff --git a/docker-compose.yaml b/docker-compose.yaml
index ce0ee405d..fd97f3f6b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -47,6 +47,7 @@ services:
       - postgresql
     environment:
       DJANGO_CREATEDEVDATA: "${DJANGO_CREATEDEVDATA:-no}"
+      DJANGO_CREATEINVENTORY: "${DJANGO_CREATEINVENTORY:-no}"
       DJANGO_DB_PASSWORD: trackerpassword
       DJANGO_DB_USER: tracker
       DJANGO_DB_NAME: trackerdb
diff --git a/incident/models/export.py b/incident/models/export.py
index 385917d3e..f51ade348 100644
--- a/incident/models/export.py
+++ b/incident/models/export.py
@@ -33,6 +33,7 @@
     'live_revision',
     'search_image',
     'blog_posts',
+    'page_blocks',
 }
 
 
diff --git a/prod-docker-compose.yaml b/prod-docker-compose.yaml
index 120b1897f..b13d28684 100644
--- a/prod-docker-compose.yaml
+++ b/prod-docker-compose.yaml
@@ -35,6 +35,7 @@ services:
       DJANGO_ALLOWED_HOSTS: app
       DJANGO_COLLECT_STATIC: "yes"
       DJANGO_CREATEDEVDATA: "${DJANGO_CREATEDEVDATA:-no}"
+      DJANGO_CREATEINVENTORY: "${DJANGO_CREATEINVENTORY:-no}"
       DJANGO_SETTINGS_MODULE: tracker.settings.production-ci
       DJANGO_SECRET_KEY: 64a235ef65834d8b42fa2802dd4290cf61c773c3f31332039ec5c48165f744da
       DJANGO_STATIC_ROOT: /django-static
diff --git a/requirements.in b/requirements.in
index 0b62a42ff..c0acf5d04 100644
--- a/requirements.in
+++ b/requirements.in
@@ -24,4 +24,5 @@ wagtail-autocomplete
 wagtail-factories
 wagtail-django-recaptcha
 wagtail-metadata
+wagtail-inventory
 unittest-xml-reporting
diff --git a/requirements.txt b/requirements.txt
index 8cd90186b..28571613a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -45,6 +45,7 @@ wagtail-autocomplete==0.3.1
 wagtail-django-recaptcha==1.0
 wagtail-factories==1.1.0
 wagtail-metadata==2.0.1
+wagtail-inventory==0.7
 wagtail==2.3
 webencodings==0.5.1       # via bleach, html5lib
 willow==1.1               # via wagtail
diff --git a/tracker/settings/base.py b/tracker/settings/base.py
index 60736c203..8bba837fb 100644
--- a/tracker/settings/base.py
+++ b/tracker/settings/base.py
@@ -70,6 +70,7 @@
     'wagtailmetadata',
     'webpack_loader',
     'wagtailautocomplete',
+    'wagtailinventory',
 
     'django.contrib.admin',
     'django.contrib.auth',