diff --git a/CHANGELOG.md b/CHANGELOG.md index 854e8aeb2..80a12fc5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,15 @@ # Changelog +## 0.5.3 + +- Allow manual configuration of slug values ([fixes #14](https://github.com/uccser/cs4teachers/issues/14)) +- Fix email address in footer ([fixes #93](https://github.com/uccser/cs4teachers/issues/93)) +- Fix displaying events if not public ([fixes #94](https://github.com/uccser/cs4teachers/issues/94)) + ## 0.5.2 -- Update favicon to be readable ([fixes #46](https://github.com/uccser/cs4teachers/issues46)) -- Add TinyMCE editor for session inline forms on admin site ([fixes #83](https://github.com/uccser/cs4teachers/issues83)) +- Update favicon to be readable ([fixes #46](https://github.com/uccser/cs4teachers/issues/46)) +- Add TinyMCE editor for session inline forms on admin site ([fixes #83](https://github.com/uccser/cs4teachers/issues/83)) ## 0.5.1 diff --git a/cs4teachers/config/__init__.py b/cs4teachers/config/__init__.py index 793e16a5f..120169145 100644 --- a/cs4teachers/config/__init__.py +++ b/cs4teachers/config/__init__.py @@ -1,3 +1,3 @@ """Configuration for Django system.""" -__version__ = "0.5.2" +__version__ = "0.5.3" diff --git a/cs4teachers/events/admin.py b/cs4teachers/events/admin.py index e5fae05c3..a6582e0f2 100644 --- a/cs4teachers/events/admin.py +++ b/cs4teachers/events/admin.py @@ -79,6 +79,13 @@ class EventAdmin(admin.ModelAdmin): "fields": ["is_published"] } ), + ( + "Advanced", + { + "fields": ["slug"], + "classes": ("grp-collapse", "grp-closed") + } + ), ] inlines = [SessionInline] formfield_overrides = { diff --git a/cs4teachers/events/migrations/0031_auto_20170828_2006.py b/cs4teachers/events/migrations/0031_auto_20170828_2006.py new file mode 100644 index 000000000..072ebe9a0 --- /dev/null +++ b/cs4teachers/events/migrations/0031_auto_20170828_2006.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2017-08-28 20:06 +from __future__ import unicode_literals + +import autoslug.fields +from django.db import migrations +import events.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0030_series_subtitle'), + ] + + operations = [ + migrations.AlterField( + model_name='event', + name='slug', + field=autoslug.fields.AutoSlugField(editable=True, populate_from=events.models.EventBase.create_slug, unique=True), + ), + migrations.AlterField( + model_name='thirdpartyevent', + name='slug', + field=autoslug.fields.AutoSlugField(editable=True, populate_from=events.models.EventBase.create_slug, unique=True), + ), + ] diff --git a/cs4teachers/events/models.py b/cs4teachers/events/models.py index 96008ae6c..56a586f33 100644 --- a/cs4teachers/events/models.py +++ b/cs4teachers/events/models.py @@ -125,7 +125,7 @@ def create_slug(self): else: return self.name - slug = AutoSlugField(unique=True, populate_from=create_slug) + slug = AutoSlugField(unique=True, populate_from=create_slug, editable=True, blank=True) name = models.CharField(max_length=150) description = models.TextField() start_date = models.DateField() diff --git a/cs4teachers/events/views.py b/cs4teachers/events/views.py index 49d6eb405..6e02e02fc 100644 --- a/cs4teachers/events/views.py +++ b/cs4teachers/events/views.py @@ -61,9 +61,19 @@ class EventView(generic.DetailView): model = Event template_name = "events/event.html" - slug_url_kwarg = "event_slug" context_object_name = "event" + def get_object(self, **kwargs): + """Retrieve object for the event view. + + Returns: + Event object, or raises 404 error if not found. + """ + return get_object_or_404( + self.model.objects.filter(is_published=True).select_related(), + slug=self.kwargs.get("event_slug", None), + ) + def get_context_data(self, **kwargs): """Provide the context data for the session view. diff --git a/cs4teachers/templates/base.html b/cs4teachers/templates/base.html index bab741e33..f58b6a2dc 100644 --- a/cs4teachers/templates/base.html +++ b/cs4teachers/templates/base.html @@ -62,7 +62,7 @@

{% block page_heading %}{% endblock page_heading %}

- Contact us: csse.education.research@canterbury.ac.nz + Contact us: csse-teacher-events@canterbury.ac.nz

cs4teachers is a project by the Computer Science Education Research Group at the University of Canterbury, New Zealand. diff --git a/requirements/base.txt b/requirements/base.txt index 67b7825f6..009babc1c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,12 +6,12 @@ django-autoslug==1.9.3 django-grappelli==2.10.1 # Configuration -django-environ==0.4.3 +django-environ==0.4.4 whitenoise==3.3.0 django-storages==1.6.5 # Python-PostgreSQL Database Adapter -psycopg2==2.7.3 +psycopg2==2.7.3.1 # Password storage argon2-cffi==16.3.0 @@ -23,7 +23,7 @@ django-google-maps==0.7.0 Pillow==4.2.1 # Storage -google-cloud-storage==1.2.0 +google-cloud-storage==1.4.0 # Text editor django-tinymce==2.6.0