[Event] : move ranking into mezzanine agenda + deleting custom list view

diff --git a/app/local_settings.py b/app/local_settings.py
index 18eb2fe847fd6d91c411e5e655e149171dd570b5..ffee9f541a20b55bbdc9982fc749551cd10f5bd2 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -189,6 +189,7 @@ EVENT_SHOP_URL = EVENT_DOMAIN+"/pub.php/event/%d/edit"
 EVENT_PASS_URL = EVENT_DOMAIN+"/pub.php/pass/"
 EVENT_CONFIRMATION_URL = EVENT_DOMAIN+"/pub.php/cart/done?transaction_id=%s"
 EVENT_EXCLUDE_TAG_LIST = [ ]
+PAST_EVENTS = True
 
 TINYMCE_SETUP_JS = "/static/js/tinymce_setup.js"
 

diff --git a/app/organization/agenda/admin.py b/app/organization/agenda/admin.py
index 4af8bc8822d895d6a5ba034008b02fe967415008..a446229a1088fcf1544949877062c8d3c6447859 100644 (file)
--- a/app/organization/agenda/admin.py
+++ b/app/organization/agenda/admin.py
@@ -82,11 +82,6 @@ class EventRelatedTitleAdmin(TranslationTabularInline):
     model = EventRelatedTitle
 
 
-class EventRankAdmin(TranslationTabularInline):
-
-    model = EventRank
-
-
 class EventPriceDescriptionAdmin(TranslationTabularInline):
 
     model = EventPriceDescription
@@ -107,23 +102,6 @@ class DynamicContentEventInline(TabularDynamicInlineAdmin):
             static("mezzanine/js/admin/dynamic_inline.js"),
         )
 
-class CustomEventAdmin(EventAdmin):
-    """
-    Admin class for events.
-    """
-
-    fieldsets = deepcopy(EventAdminBase.fieldsets)
-    exclude = ("short_url", )
-    list_display = ["title", "start", "end", "rank", "user", "status", "admin_link"]
-    if settings.EVENT_USE_FEATURED_IMAGE:
-        list_display.insert(0, "admin_thumb")
-    list_filter = deepcopy(DisplayableAdmin.list_filter) + ("location", "category")
-    inlines = [EventRankAdmin, EventPeriodInline, EventBlockInline, EventImageInline, EventDepartmentInline,
-                EventPersonInline, EventLinkInline, EventPlaylistInline, EventTrainingInline,
-                EventRelatedTitleAdmin, DynamicContentEventInline]
-
-    def rank(self, obj):
-        return obj.event_rank.rank
 
     def save_form(self, request, form, change):
         """
@@ -149,11 +127,9 @@ class EventTrainingLevelAdmin(BaseTranslationModelAdmin):
 
 
 
-admin.site.unregister(Event)
 admin.site.unregister(EventPrice)
 admin.site.unregister(EventCategory)
 admin.site.register(EventPublicType, EventPublicTypeAdmin)
 admin.site.register(EventTrainingLevel, EventTrainingLevelAdmin)
-admin.site.register(Event, CustomEventAdmin)
 admin.site.register(EventCategory, CustomEventCategoryAdmin)
 admin.site.register(EventPrice, CustomEventPriceAdmin)

diff --git a/app/organization/agenda/migrations/0025_auto_20170222_1011.py b/app/organization/agenda/migrations/0025_auto_20170222_1011.py
new file mode 100644 (file)
index 0000000..4998e63
--- /dev/null
+++ b/app/organization/agenda/migrations/0025_auto_20170222_1011.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-02-22 09:11
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-agenda', '0024_eventrank'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='eventrank',
+            name='event',
+        ),
+        migrations.DeleteModel(
+            name='EventRank',
+        ),
+    ]

diff --git a/app/organization/agenda/models.py b/app/organization/agenda/models.py
index fe1cd5ed2b1c1c54aedd03e484e562bddfb5c2b1..cfd9523fe8659728d2de7206ff59a5ba85f11b4b 100644 (file)
--- a/app/organization/agenda/models.py
+++ b/app/organization/agenda/models.py
@@ -70,16 +70,6 @@ class EventPerson(models.Model):
         verbose_name_plural = _("persons")
 
 
-class EventRank(models.Model):
-
-    event = models.OneToOneField(Event, verbose_name=_('event'), related_name='event_rank', blank=True, null=True, on_delete=models.SET_NULL)
-    rank = models.IntegerField(verbose_name=_('rank'), blank=True, null=True)
-
-    class Meta:
-        verbose_name = _("rank")
-        verbose_name_plural = _("ranks")
-
-
 class EventLink(Link):
 
     event = models.ForeignKey(Event, verbose_name=_('event'), related_name='links', blank=True, null=True, on_delete=models.SET_NULL)

diff --git a/app/organization/agenda/translation.py b/app/organization/agenda/translation.py
index ccea677978612e7c7f60ed8a2a7537c4068860f3..6764de58509dc64d66cc8c077de41bec901417b6 100644 (file)
--- a/app/organization/agenda/translation.py
+++ b/app/organization/agenda/translation.py
@@ -106,9 +106,3 @@ class EventPriceDescriptionTranslationOptions(TranslationOptions):
 class EventPriceTranslationOptions(TranslationOptions):
 
     fields = ()
-
-
-@register(EventRank)
-class EventRankTranslationOptions(TranslationOptions):
-
-    fields = ()

diff --git a/app/organization/agenda/urls.py b/app/organization/agenda/urls.py
index fb41dab0700de0d46a7e82f3ee5ddb637ce8526c..fe74be4fe8e370a09f3b2336dd3218dad1ff5a2a 100644 (file)
--- a/app/organization/agenda/urls.py
+++ b/app/organization/agenda/urls.py
@@ -35,7 +35,6 @@ from organization.agenda.views import *
 
 urlpatterns = [
     url("^%s/" % settings.EVENT_SLUG, include("mezzanine_agenda.urls")),
-    url("^%s-list/$" % settings.EVENT_SLUG, CustomEventListView.as_view(), name="custom_event_list"),
     url("^%s/confirmation/(?P<transaction_id>[0-9]*)$" % settings.EVENT_SLUG, ConfirmationView.as_view(), name="organization-agenda-confirmation"),
     url("^dynamic-content-event/$",  permission_required('event.can_edit')(DynamicContentEventView.as_view()), name='dynamic-content-event'),
 ]

diff --git a/app/organization/agenda/views.py b/app/organization/agenda/views.py
index 8972b4887ba8901d78f59b155c7e84054eaea979..968bdc85a32a3d116ccffb073fd41a525f810523 100644 (file)
--- a/app/organization/agenda/views.py
+++ b/app/organization/agenda/views.py
@@ -69,19 +69,3 @@ class DynamicContentEventView(Select2QuerySetSequenceView):
     def get_results(self, context):
         results = autocomplete_result_formatting(self, context)
         return results
-
-
-class CustomEventListView(EventListView):
-    past_events = []
-    paginate_by = settings.EVENT_PER_PAGE
-
-    def get_queryset(self, tag=None):
-        qs = super(CustomEventListView, self).get_queryset(tag=None)
-        qs = qs.order_by("event_rank__rank", "start") # loosing start ordering. Had to regive it.
-        self.past_events = Event.objects.filter(Q(start__lt=datetime.now()) | Q(end__lt=datetime.now())).order_by("start")
-        return qs
-
-    def get_context_data(self, *args, **kwargs):
-        context = super(CustomEventListView, self).get_context_data(**kwargs)
-        context['past_events'] = self.past_events
-        return context