Merge pull request #433 from ox-it/make-current-browse-page-homepage-…

…1927 Make current browse page homepage 1927
ox-it · Apr 26, 2016 · 21a3e7e · 21a3e7e
2 parents 24b50ae + f11a5e4
commit 21a3e7e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/talks/api/services.py b/talks/api/services.py
@@ -4,6 +4,8 @@
 from talks.core.utils import parse_date
 from talks.events.datasources import DEPARTMENT_DESCENDANT_DATA_SOURCE
 from talks.events.models import ROLES_SPEAKER, Event, EventGroup
+from datetime import datetime, timedelta
+
 
 
 def events_search(parameters):
@@ -24,7 +26,7 @@ def events_search(parameters):
 
     to_date = parse_date(parameters.get("to"))
     if to_date:
-        queries.append(Q(start__lt=to_date))
+        queries.append(Q(start__lt=to_date+timedelta(1)))
 
     include_sub_departments = True
     subdepartments = parameters.get("subdepartments")

diff --git a/talks/templates/base.html b/talks/templates/base.html
@@ -55,7 +55,6 @@
                 <div class="container-fluid">
                     {% url 'homepage' as home %}
                     {% url 'create-event' as create_event %}
-                    {% url 'browse_events' as browse_events %}
                     {% url 'contributors-events' as contributors_homepage %}
                     {% url 'manage-lists' as manage_lists %}
                     <div class="navbar-header">
@@ -69,7 +68,6 @@
                         {% if perms.events.add_event %}
                             <li {% ifequal request.path create_event %} class="active" {% endifequal %}><a href="{{ create_event }}">New Talk</a></li>
                         {% endif %}
-                            <li {% ifequal request.path browse_events %} class="active" {% endifequal %}><a href="{{ browse_events }}">Browse Talks</a></li>
                     </ul>
                     <form class="navbar-form navbar-left" role="search" method="get" action="{% url 'haystack_search' %}">
                         <div class="form-group">

diff --git a/talks/urls.py b/talks/urls.py
@@ -26,7 +26,7 @@
 
     url(r'^search/', SearchView(form_class=DateFacetedSearchForm, searchqueryset=sqs, load_all=False),
         name='haystack_search'),
-    url(r'^$', homepage, name='homepage'),
+    url(r'^$', browse_events, name='homepage'),
     url(r'^browse$', browse_events, name='browse_events'),
     url(r'^talks/', include(events_urls)),
     url(r'^admin/', include(admin.site.urls)),