From 1bc28b4b1b688a93f4e059e855f9a8d164e90e1d Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry@openstack.org>
Date: Thu, 16 Mar 2017 13:46:26 +0100
Subject: [PATCH] Disable scheduling module

We won't be making use of the scheduling module for
the Boston forum. Disable it in configuration, and
remove links from the cfp module to the scheduling
module in case it's not loaded.

Change-Id: I985f2bda2cda872e553ba52b27f3c264cf8a97bd
---
 cfp/templates/topiclist.html | 8 +++++++-
 cfp/views.py                 | 1 +
 odsreg/settings.py           | 2 +-
 odsreg/urls.py               | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/cfp/templates/topiclist.html b/cfp/templates/topiclist.html
index dcfd506..5a64ecd 100644
--- a/cfp/templates/topiclist.html
+++ b/cfp/templates/topiclist.html
@@ -1,19 +1,25 @@
 {% extends "base.html" %}
 {% block helppage %}
 <p>This is the topic lead review screen. It lists all session suggestions for your topic so far.</p>
+{% if sched %}
 <p>A graph shows you how many sessions you have proposed, preapproved and scheduled against the number of available slots you have for your topic.</p>
+{% endif %}
 <p>You can see the details of a proposed session (or edit sessions that are not in <i>Preapproved</i> state yet) by clicking on its title. You can sort the results by clicking on the corresponding table headers.</p>
 <p>To change the status for a given session, click on the <i>Status</i> you want to change.</p>
+{% if sched %}
 <p>Finally, when you're ready to do the scheduling of your topic, you can click on the <i>Scheduling</i> button.</p>
+{% endif %}
 {% endblock %}
 {% block content %}
 <script type="text/javascript" src="/media/sorting.js"></script>
 <div class="span-8">
 <h2>{{ topic.name }}</h2>
 <a class=roundedButton href=/>Back to proposals list</A>
+{% if sched %}
 <a class=roundedButton href="/scheduling/{{ topic.id }}">Scheduling</A>
+</div><div id="vis"><iframe frameborder=0 width=580 height=100 src=/scheduling/graph/{{ topic.id }}></iframe>
+{% endif %}
 </div>
-<div id="vis"><iframe frameborder=0 width=580 height=100 src=/scheduling/graph/{{ topic.id }}></iframe></div>
 <table>
 <tr>
 <th>Topic</th>
diff --git a/cfp/views.py b/cfp/views.py
index d75a922..f5d779b 100644
--- a/cfp/views.py
+++ b/cfp/views.py
@@ -48,6 +48,7 @@ def topiclist(request, topicid):
     request.session['lastlist'] = "cfp/topic/%s" % topicid
     return TemplateResponse(request, "topiclist.html",
                             {'proposals': proposals,
+                             'sched': 'scheduling' in settings.INSTALLED_APPS,
                              'topic': topic})
 
 
diff --git a/odsreg/settings.py b/odsreg/settings.py
index da8da59..c7a5116 100644
--- a/odsreg/settings.py
+++ b/odsreg/settings.py
@@ -84,7 +84,7 @@ INSTALLED_APPS = [
     'django_openid_auth',
     'django.contrib.admin',
     'cfp',
-    'scheduling',
+    # 'scheduling',
 ]
 
 AUTHENTICATION_BACKENDS = (
diff --git a/odsreg/urls.py b/odsreg/urls.py
index 93e6f09..7b43f6f 100644
--- a/odsreg/urls.py
+++ b/odsreg/urls.py
@@ -24,7 +24,7 @@ urlpatterns = [
     url(r'^openid/', include('django_openid_auth.urls')),
     url(r'^$', views.list),
     url(r'^cfp/', include('cfp.urls')),
-    url(r'^scheduling/', include('scheduling.urls')),
+    # url(r'^scheduling/', include('scheduling.urls')),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^logout$', views.dologout),
 ]