#243 Navbar refactor

eventoL · Mar 16, 2017 · 738dc36 · 738dc36
1 parent 64c9131
commit 738dc36
Show file tree

Hide file tree

Showing 6 changed files with 200 additions and 190 deletions.
diff --git a/eventoL/urls.py b/eventoL/urls.py
@@ -8,15 +8,17 @@
 admin.autodiscover()
 
 urlpatterns = [
-    url(r'^$', views.home, name="home"),
-    url(r'^create-event/$', views.create_event, name="create_event"),
-    url(r'^event/', include('manager.urls'), name='event'),
-    url(r'^admin/', include(admin.site.urls), name='admin'),
-    url(r'^ckeditor/', include('ckeditor_uploader.urls'), name='ckeditor'),
-    url(r'^accounts/profile/', TemplateView.as_view(template_name='account/profile.html'), name="user_profile"),
-    url(r'^accounts/', include('allauth.urls'))
-] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+                  url(r'^$', views.home, name="home"),
+                  url(r'^create-event/$', views.create_event, name="create_event"),
+                  url(r'^event/', include('manager.urls'), name='event'),
+                  url(r'^admin/', include(admin.site.urls), name='admin'),
+                  url(r'^ckeditor/', include('ckeditor_uploader.urls'), name='ckeditor'),
+                  url(r'^accounts/profile/', TemplateView.as_view(template_name='account/profile.html'),
+                      name="user_profile"),
+                  url(r'^accounts/', include('allauth.urls'))
+              ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 if settings.DEBUG:
     import debug_toolbar
-    urlpatterns += [url(r'^__debug__/', include(debug_toolbar.urls))]
+
+    urlpatterns += [url(r'^__debug__/', include(debug_toolbar.urls))]
diff --git a/manager/models.py b/manager/models.py
@@ -184,12 +184,6 @@ class Meta(object):
         verbose_name_plural = _('Attendees')
         unique_together = (("event", "email"),)
 
-    @classmethod
-    def filter_by(cls, queryset, field, value):
-        if field == 'event':
-            return queryset.filter(event__pk=value)
-        return queryset
-
     def __unicode__(self):
         return u'%s %s - %s - %s' % (self.first_name, self.last_name, self.nickname, self.email)
 
@@ -370,12 +364,6 @@ class Installation(models.Model):
     def __unicode__(self):
         return u"%s, %s, %s" % (self.attendee, self.hardware, self.software)
 
-    @classmethod
-    def filter_by(cls, queryset, field, value):
-        if field == 'event':
-            return queryset.filter(attendee__event__pk=value)
-        return queryset
-
     class Meta(object):
         verbose_name = _('Installation')
         verbose_name_plural = _('Installations')