Rm featured modules, rm EventCategory

diff --git a/app/local_settings.py b/app/local_settings.py
index 3f48283214ebf4cc895bee0bbd1f8dda0561dbb5..fde9ff7080dae34751758ed97240254ebea5ae57 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -69,9 +69,9 @@ SITE_TAGLINE = 'Institut de Recherche et de Coordination Acoustique et Musique'
 SILENCED_SYSTEM_CHECKS = ['fields.W342',]
 
 ADMIN_MENU_ORDER = (
-    (_('Pages'), ('pages.Page', 'organization-featured.Featured', 'organization-pages.Home')),
+    (_('Pages'), ('pages.Page', 'organization-pages.Home')),
     (_('Media'), ('organization-media.Video', 'organization-media.VideoCategory', 'organization-media.Audio', 'organization-media.Playlist', (_('Media Library'), 'fb_browse'),)),
-    (_('Events'), ('mezzanine_agenda.Event', 'mezzanine_agenda.EventLocation', 'mezzanine_agenda.EventCategory', 'mezzanine_agenda.EventPrice',)),
+    (_('Events'), ('mezzanine_agenda.Event', 'mezzanine_agenda.EventLocation', 'mezzanine_agenda.EventPrice',)),
     (_('Magazine'), ('organization-magazine.Article', 'organization-magazine.Brief',)),
     (_('Organization'), ('organization-team.Organization', 'organization-team.Department', 'organization-team.Team', 'organization-team.Person', 'organization-team.Activity', 'organization-team.OrganizationType',)),
     (_('Projects'), ('organization-project.Project',)),
@@ -110,9 +110,6 @@ else:
 
 SLUGIFY = 'django.template.defaultfilters.slugify'
 
-HOME_FEATURED_ID = 1
-BREAKING_NEWS_FEATURED_ID = 4
-
 BLOG_POST_PER_PAGE = 200
 
 # The numeric mode to set newly-uploaded files to. The value should be

diff --git a/app/organization/featured/__init__.py b/app/organization/featured/__init__.py
deleted file mode 100644 (file)
index da824c3..0000000
--- a/app/organization/featured/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-"""
-Provides abstract models and admin features used throughout the various
-Mezzanine apps.
-"""
-from __future__ import unicode_literals
-
-default_app_config = 'organization.featured.apps.FeaturedConfig'

diff --git a/app/organization/featured/admin.py b/app/organization/featured/admin.py
deleted file mode 100644 (file)
index ae833a7..0000000
--- a/app/organization/featured/admin.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from django.contrib import admin
-
-from organization.featured.models import *
-
-
-class FeaturedAdmin(admin.ModelAdmin):
-
-    model = Featured
-    list_display = ('__unicode__',)
-    filter_horizontal = ['events', 'videos', 'articles', 'pages', 'playlists', 'briefs']
-
-
-admin.site.register(Featured, FeaturedAdmin)

diff --git a/app/organization/featured/apps.py b/app/organization/featured/apps.py
deleted file mode 100644 (file)
index ab45736..0000000
--- a/app/organization/featured/apps.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import unicode_literals
-
-from django.apps import AppConfig
-
-
-class FeaturedConfig(AppConfig):
-
-    name = 'organization.featured'
-    label = 'organization-featured'

diff --git a/app/organization/featured/migrations/0001_initial.py b/app/organization/featured/migrations/0001_initial.py
deleted file mode 100644 (file)
index ad3a25c..0000000
--- a/app/organization/featured/migrations/0001_initial.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-14 16:53
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('organization-media', '__first__'),
-        ('organization-core', '0001_initial'),
-        ('mezzanine_agenda', '__first__'),
-        ('organization-magazine', '__first__'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Featured',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=512, verbose_name='name')),
-                ('description', models.TextField(blank=True, verbose_name='description')),
-                ('articles', models.ManyToManyField(blank=True, related_name='featured', to='organization-magazine.Article', verbose_name='articles')),
-                ('briefs', models.ManyToManyField(blank=True, related_name='featured', to='organization-magazine.Brief', verbose_name='briefs')),
-                ('events', models.ManyToManyField(blank=True, related_name='featured', to='mezzanine_agenda.Event', verbose_name='events')),
-                ('pages', models.ManyToManyField(blank=True, related_name='featured', to='organization-core.BasicPage', verbose_name='pages')),
-                ('playlists', models.ManyToManyField(blank=True, related_name='featured', to='organization-media.Playlist', verbose_name='playlists')),
-                ('videos', models.ManyToManyField(blank=True, related_name='featured', to='organization-media.Video', verbose_name='videos')),
-            ],
-            options={
-                'abstract': False,
-            },
-        ),
-    ]

diff --git a/app/organization/featured/migrations/0002_remove_featured_description.py b/app/organization/featured/migrations/0002_remove_featured_description.py
deleted file mode 100644 (file)
index ae887f5..0000000
--- a/app/organization/featured/migrations/0002_remove_featured_description.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-24 23:17
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-featured', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='featured',
-            name='description',
-        ),
-    ]

diff --git a/app/organization/featured/migrations/0003_remove_featured_briefs.py b/app/organization/featured/migrations/0003_remove_featured_briefs.py
deleted file mode 100644 (file)
index cd49208..0000000
--- a/app/organization/featured/migrations/0003_remove_featured_briefs.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-05 11:00
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-featured', '0002_remove_featured_description'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='featured',
-            name='briefs',
-        ),
-    ]

diff --git a/app/organization/featured/migrations/0004_featured_briefs.py b/app/organization/featured/migrations/0004_featured_briefs.py
deleted file mode 100644 (file)
index 19a7e30..0000000
--- a/app/organization/featured/migrations/0004_featured_briefs.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-05 14:38
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-magazine', '0009_brief_sort_order'),
-        ('organization-featured', '0003_remove_featured_briefs'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='featured',
-            name='briefs',
-            field=models.ManyToManyField(blank=True, related_name='featured', to='organization-magazine.Brief', verbose_name='briefs'),
-        ),
-    ]

diff --git a/app/organization/featured/migrations/__init__.py b/app/organization/featured/migrations/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/app/organization/featured/models.py b/app/organization/featured/models.py
deleted file mode 100644 (file)
index 20c7206..0000000
--- a/app/organization/featured/models.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from __future__ import unicode_literals
-
-from django.db import models
-from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse, reverse_lazy
-from django.conf import settings
-
-from organization.core.models import *
-from organization.magazine.models import *
-from organization.media.models import *
-
-from mezzanine_agenda.models import Event
-
-
-class Featured(Named):
-    """(Featured description)"""
-
-    pages = models.ManyToManyField(BasicPage, verbose_name=_('pages'), related_name='featured', blank=True)
-    articles = models.ManyToManyField(Article, verbose_name=_('articles'), related_name='featured', blank=True)
-    events = models.ManyToManyField(Event, verbose_name=_('events'), related_name='featured', blank=True)
-    videos = models.ManyToManyField(Video, verbose_name=_('videos'), related_name='featured', blank=True)
-    playlists = models.ManyToManyField(Playlist, verbose_name=_('playlists'), related_name='featured', blank=True)
-    briefs = models.ManyToManyField(Brief, verbose_name=_('briefs'), related_name='featured', blank=True)
-
-
-    def __unicode__(self):
-        return self.name

diff --git a/app/organization/featured/templatetags/featured_tags.py b/app/organization/featured/templatetags/featured_tags.py
deleted file mode 100644 (file)
index 63fd889..0000000
--- a/app/organization/featured/templatetags/featured_tags.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# -*- coding: utf-8 -*-
-from mezzanine.pages.models import Page
-#from mezzanine.blog.models import BlogPost
-from mezzanine.template import Library
-from mezzanine_agenda.models import Event
-from mezzanine.conf import settings
-from random import shuffle
-
-from organization.festival.models import *
-from organization.featured.models import *
-
-register = Library()
-
-
-@register.filter
-def subtract(value, arg):
-    return value - arg
-
-@register.as_tag
-def featured_edito(*args):
-    qs = Page.objects.filter(slug="edito")
-    if qs:
-        return qs[0].get_content_model()
-    else:
-        return None
-
-@register.as_tag
-def featured_events(*args):
-    featured = Featured.objects.all()
-    if featured:
-        return featured[0].events.order_by('start')
-    return None
-
-@register.as_tag
-def featured(*args):
-    featured_list = []
-    featured = Featured.objects.filter(id=settings.HOME_FEATURED_ID)
-    if featured:
-        featured = featured[0]
-        for page in featured.pages.all():
-            featured_list.append(page)
-        for article in featured.articles.all():
-            featured_list.append(article)
-        for brief in featured.briefs.all():
-            featured_list.append(brief)
-        for video in featured.videos.all():
-            featured_list.append(video)
-        for playlist in featured.playlists.all():
-            featured_list.append(playlist)
-        shuffle(featured_list)
-    return featured_list
-
-@register.as_tag
-def featured_breaking_news_content(*args):
-    featured = Featured.objects.filter(id=settings.BREAKING_NEWS_FEATURED_ID)
-    if featured:
-        featured = featured[0]
-        news = featured.pages.all()
-        if news:
-            return news[0].richtextpage.content
-        else:
-            return ''
-    return ''
-
-@register.filter
-def get_class(obj):
-    return obj.__class__.__name__
-
-@register.filter
-def unique_posts(events):
-    post_list = []
-    for event in events:
-        for post in event.blog_posts.all():
-            print(post)
-            if not post in post_list:
-                post_list.append(post)
-    return post_list
-
-@register.filter
-def no_parents(events):
-    return events.filter(parent=None)

diff --git a/app/organization/featured/tests.py b/app/organization/featured/tests.py
deleted file mode 100644 (file)
index 7ce503c..0000000
--- a/app/organization/featured/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

diff --git a/app/organization/featured/urls.py b/app/organization/featured/urls.py
deleted file mode 100644 (file)
index db08f17..0000000
--- a/app/organization/featured/urls.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from __future__ import unicode_literals
-
-import django.views.i18n
-from django.conf.urls import patterns, include, url
-from django.conf.urls.i18n import i18n_patterns
-
-from mezzanine.core.views import direct_to_template
-from mezzanine.conf import settings
-
-urlpatterns = [
-]

diff --git a/app/organization/featured/views.py b/app/organization/featured/views.py
deleted file mode 100644 (file)
index 495a1d8..0000000
--- a/app/organization/featured/views.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from django.shortcuts import render
-from django.views.generic import DetailView, ListView, TemplateView
-from organization.core.views import SlugMixin
-from organization.magazine.models import Brief

diff --git a/app/organization/urls.py b/app/organization/urls.py
index 145430bdd777e6c6039f453b73ba02924429c2bf..28fe59a380de8997970346855a280f3eb3016e31 100644 (file)
--- a/app/organization/urls.py
+++ b/app/organization/urls.py
@@ -14,7 +14,6 @@ from mezzanine.conf import settings
 urlpatterns = [
     url("^", include('organization.core.urls')),
     url("^", include('organization.pages.urls')),
-    url("^", include('organization.featured.urls')),
     url("^", include('organization.festival.urls')),
     url("^", include('organization.magazine.urls')),
     url("^", include('organization.media.urls')),

diff --git a/app/settings.py b/app/settings.py
index 7c46b16f4ff76f77000b655dbbbca4cf6b756213..ded9b9adcb7a91c296056aa0ec4fd1fb8a6d8887 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -233,7 +233,6 @@ INSTALLED_APPS = [
     "organization.magazine",
     "organization.media",
     "organization.project",
-    "organization.featured",
 ]