Fixed Issues/412 ability to clear sections/instance web/api

setup.py

@@ -52,15 +52,16 @@ def read_file(filename):
         'django-subdomain-instances >= 1.0',
         'easy-thumbnails >= 2.1',
         'unicode-slugify == 0.1.1',
+        'requests',
+        'lxml',
+        dateutil,
     ] + ssl,
     extras_require={
         'test': [
             'selenium < 3',
             'mock',
             'django-nose == 1.4.2',
             'Mutagen',
-            'lxml',
-            dateutil,
             'requests_cache',
         ],
         'develop': [

speeches/models.py

@@ -239,7 +239,7 @@ class Section(AuditedModel, InstanceMixin):
         _('session'), blank=True, help_text=_('Legislative session'))
     parent = models.ForeignKey(
         'self', verbose_name=_('parent'), null=True, blank=True,
-        related_name='children')
+        related_name='children', on_delete=models.CASCADE)
     slug = SluggableField(
         _('slug'), unique_with=('parent', 'instance'), populate_from='title', always_update=True)
     source_url = models.TextField(_('source URL'), blank=True)
@@ -590,8 +590,8 @@ class Speech(InstanceMixin, AudioMP3Mixin, AuditedModel):
     # The section that this speech is part of
     section = models.ForeignKey(
         Section, verbose_name=_('Section'), blank=True, null=True,
-        on_delete=models.SET_NULL,
-        help_text=('The section that this speech is contained in'),)
+        on_delete=models.CASCADE,
+        help_text=('The section that this speech is contained in'))
     num = models.TextField(
         _('number'), blank=True,
         help_text=_('The number of the speech, if relevant'))
@@ -888,3 +888,4 @@ def create_or_update_speeches(self, instance):
                     timestamp.save()
 
         return created_speeches
+

speeches/templates/speeches/section_form.html

@@ -68,6 +68,9 @@ <h1>{% trans "Add a section" %}</h1>
 
 <div class="form-actions">
     <input type="submit" id="section_submit" class="button" value="{{ submit }}">
+    {% if form.instance.id %}
+      <a href="{{ section.get_delete_url }}" class="button secondary">{% trans "Delete section" %}</a>
+    {% endif %}
 </div>
 
 </form>

speeches/templatetags/pagination_tags.py

@@ -135,5 +135,6 @@ def paginate(context, window=DEFAULT_WINDOW, hashtag=''):
     except (KeyError, AttributeError):
         return {}
 
+
 register.inclusion_tag('pagination/pagination.html', takes_context=True)(
     paginate)