Merge branch '960/empty-index-settings'

okfn · Mar 20, 2017 · 08baa94 · 08baa94
2 parents 5b3faff + 2e194d2
commit 08baa94
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/census/views/admin.html b/census/views/admin.html
@@ -28,7 +28,7 @@ <h2>{{ gettext('Data actions') }}</h2>
       <li><form action="/admin/load/places" method="post"><button class="btn btn-primary" type="submit">{{ gettext('Reload Places') }}</button></form></li>
       <li><form action="/admin/load/datasets" method="post"><button class="btn btn-primary" type="submit">{{ gettext('Reload Datasets (& QuestionSets)') }}</button></form></li>
       <li><form action="/admin/load/questionsets" method="post"><button class="btn btn-primary" type="submit">{{ gettext('Reload QuestionSets') }}</button></form></li>
-      <li><form action="/admin/buildindex" method="post"><button class="btn btn-primary" type="submit" {% if not site.indexSettings %}disabled{% endif %}>{{ gettext('Build Index Website') }}</button> {% if not site.indexSettings %}(No Index Settings for site){% endif %}</form></li>
+      <li><form action="/admin/buildindex" method="post"><button class="btn btn-primary" type="submit" {% if not site.indexSettings|length %}disabled{% endif %}>{{ gettext('Build Index Website') }}</button> {% if not site.indexSettings|length %}(No Index Settings for site){% endif %}</form></li>
     </ul>
   </div>
 </div>

diff --git a/index/metalsmith-godi-getdata.js b/index/metalsmith-godi-getdata.js
@@ -36,10 +36,10 @@ function plugin(options) {
     .then(site => {
       // Validate that there's a site and site.indexSettings
       if (site) {
-        if (_.get(site, 'indexSettings')) {
-          return modelUtils.getData(defaultOptions);
-        } else {
+        if (_.isEmpty(_.get(site, 'indexSettings'))) {
           throw new Error(`Can't generate Index. Site '${options.domain}' has no index settings.`);
+        } else {
+          return modelUtils.getData(defaultOptions);
         }
       } else {
         throw new Error(`Can't generate Index. Site '${options.domain}' does not exist.`);