From e92ef09f6f178fa3b1d956a0814b70a476d5dec5 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bonicoli <pierre-louis.bonicoli@libregerbil.fr>
Date: Tue, 14 Mar 2017 13:13:17 +0100
Subject: [PATCH] project_type: value 'all' may not be defined

project_type 'all' is defined in default data but isn't a mandatory
value.

Related-Bug: #1507155
Change-Id: I4b8791ff67179405d5de63f2eeb7880284266639
Signed-off-by: Pierre-Louis Bonicoli <pierre-louis.bonicoli@libregerbil.fr>
---
 stackalytics/dashboard/helpers.py                     | 6 ++++--
 stackalytics/dashboard/templates/reports/members.html | 6 +++---
 stackalytics/dashboard/vault.py                       | 2 --
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/stackalytics/dashboard/helpers.py b/stackalytics/dashboard/helpers.py
index bc9cf1f00..74f0e4263 100644
--- a/stackalytics/dashboard/helpers.py
+++ b/stackalytics/dashboard/helpers.py
@@ -320,7 +320,9 @@ def make_page_title(project_type_inst, release, module_inst, company,
     pt_class = project_type_inst['id']
     if project_type_inst.get('parent'):
         pt_class = project_type_inst['parent']['id']
-    is_openstack = pt_class == 'all' or pt_class[:9] == 'openstack'
+    pt_title = project_type_inst['title']
+    is_openstack = (pt_title.lower() == 'openstack' or
+                    pt_class[:9] == 'openstack')
 
     if company or user_inst:
         if user_inst:
@@ -333,7 +335,7 @@ def make_page_title(project_type_inst, release, module_inst, company,
         if is_openstack:
             s = 'OpenStack community'
         else:
-            s = project_type_inst['title'] + ' community'
+            s = pt_title + ' community'
     s += ' contribution'
     if module_inst:
         s += ' to %s' % module_inst['module_group_name']
diff --git a/stackalytics/dashboard/templates/reports/members.html b/stackalytics/dashboard/templates/reports/members.html
index 88dd8bf69..05d2b7558 100644
--- a/stackalytics/dashboard/templates/reports/members.html
+++ b/stackalytics/dashboard/templates/reports/members.html
@@ -194,7 +194,7 @@
         var options = {};
         options['release'] = 'all';
         options['metric'] = 'members';
-        options['project_type'] = 'all';
+        options['project_type'] = '{{ project_type }}';
 
         options['company'] = $('#company_selector').val();
         options['days'] = $('#days_selector').val();
@@ -211,7 +211,7 @@
     function show_page() {
 
         var start_date = get_start_date();
-        var base_options = { metric: 'members', project_type: 'all', release: 'all', start_date: start_date };
+        var base_options = { metric: 'members', project_type: '{{ project_type }}', release: 'all', start_date: start_date };
         renderTimeline(base_options);
 
         show_engineers_table(base_options);
@@ -230,7 +230,7 @@
     $(document).ready(function () {
 
         var start_date = get_start_date();
-        var base_options = { metric: 'members', project_type: 'all', release: 'all', start_date: start_date };
+        var base_options = { metric: 'members', project_type: '{{ project_type }}', release: 'all', start_date: start_date };
 
         initSingleSelector("company", makeURI("/api/1.0/companies", base_options), {allowClear: true});
 
diff --git a/stackalytics/dashboard/vault.py b/stackalytics/dashboard/vault.py
index 8384f73e2..314b1d104 100644
--- a/stackalytics/dashboard/vault.py
+++ b/stackalytics/dashboard/vault.py
@@ -194,8 +194,6 @@ def is_project_type_valid(project_type):
     if not project_type:
         return False
     project_type = project_type.lower()
-    if project_type == 'all':
-        return True
     project_types = get_vault().get('project_types_index', [])
     return project_type in project_types