From 9aae45af4bc7946650391e9a15b25ec00052c6a5 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 7 Jul 2016 18:28:39 +0200 Subject: [PATCH] add urls to each module --- app/local_settings.py | 6 +++--- app/organization/core/urls.py | 15 +++++++++++++ app/organization/core/views.py | 14 ++++++++++++- app/organization/featured/urls.py | 13 ++++++++++++ app/organization/festival/urls.py | 2 +- app/organization/magazine/urls.py | 13 ++++++++++++ app/organization/media/urls.py | 4 ++-- .../migrations/0002_auto_20160707_1053.py | 6 +++--- app/organization/project/models.py | 2 +- app/organization/project/urls.py | 13 ++++++++++++ app/organization/structure/apps.py | 9 -------- .../{structure => team}/__init__.py | 2 +- app/organization/{structure => team}/admin.py | 0 app/organization/team/apps.py | 9 ++++++++ .../migrations/0001_initial.py | 20 +++++++++--------- .../migrations/0002_auto_20160707_1614.py | 2 +- .../migrations/__init__.py | 0 .../{structure => team}/models.py | 0 app/organization/{structure => team}/tests.py | 0 app/organization/team/urls.py | 15 +++++++++++++ app/organization/{structure => team}/views.py | 0 app/organization/urls.py | 21 +++++++++++++++++++ app/settings.py | 2 +- app/urls.py | 8 ++++--- 24 files changed, 140 insertions(+), 36 deletions(-) create mode 100644 app/organization/core/urls.py create mode 100644 app/organization/featured/urls.py create mode 100644 app/organization/magazine/urls.py create mode 100644 app/organization/project/urls.py delete mode 100644 app/organization/structure/apps.py rename app/organization/{structure => team}/__init__.py (72%) rename app/organization/{structure => team}/admin.py (100%) create mode 100644 app/organization/team/apps.py rename app/organization/{structure => team}/migrations/0001_initial.py (93%) rename app/organization/{structure => team}/migrations/0002_auto_20160707_1614.py (92%) rename app/organization/{structure => team}/migrations/__init__.py (100%) rename app/organization/{structure => team}/models.py (100%) rename app/organization/{structure => team}/tests.py (100%) create mode 100644 app/organization/team/urls.py rename app/organization/{structure => team}/views.py (100%) create mode 100644 app/organization/urls.py diff --git a/app/local_settings.py b/app/local_settings.py index fdf1d784..96e92ada 100644 --- a/app/local_settings.py +++ b/app/local_settings.py @@ -72,9 +72,9 @@ ADMIN_MENU_ORDER = ( (_('Content'), ('pages.Page', 'blog.BlogPost', 'mezzanine_agenda.Event', 'generic.ThreadedComment', (_('Media Library'), 'fb_browse'),)), (_("Magazine"), ("magazine.Article",)), - (_('Structure'), ('organization.structure.Organization', 'organization.structure.Team', - 'organization.structure.Department', 'organization.structure.Person', - 'organization.structure.Activity')), + (_('team'), ('organization.team.Organization', 'organization.team.Team', + 'organization.team.Department', 'organization.team.Person', + 'organization.team.Activity')), (_('Projects'), ('organization.project.Project')), (_('Festival'), ('organization.festival.Artist', 'organization.festival.Video', 'organization.festival.Audio', 'organization.festival.Playlist', diff --git a/app/organization/core/urls.py b/app/organization/core/urls.py new file mode 100644 index 00000000..68af3c40 --- /dev/null +++ b/app/organization/core/urls.py @@ -0,0 +1,15 @@ +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 + +from organization.core.views import HomeView + + +urlpatterns = [ + url("^$", HomeView.as_view(), name="home"), +] diff --git a/app/organization/core/views.py b/app/organization/core/views.py index 34f51cd6..82dc1b0c 100644 --- a/app/organization/core/views.py +++ b/app/organization/core/views.py @@ -1,4 +1,7 @@ -from django.shortcuts import render +from django.shortcuts import render, get_object_or_404 +from django.http import Http404 +from django.views.generic.base import View +from django.views.generic import DetailView, ListView, TemplateView class SlugMixin(object): @@ -6,3 +9,12 @@ class SlugMixin(object): def get_object(self): objects = self.model.objects.all() return get_object_or_404(objects, slug=self.kwargs['slug']) + + +class HomeView(TemplateView): + + template_name = 'index.html' + + def get_context_data(self, **kwargs): + context = super(HomeView, self).get_context_data(**kwargs) + return context diff --git a/app/organization/featured/urls.py b/app/organization/featured/urls.py new file mode 100644 index 00000000..cea975ae --- /dev/null +++ b/app/organization/featured/urls.py @@ -0,0 +1,13 @@ +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/festival/urls.py b/app/organization/festival/urls.py index 920e5eff..c13eedb4 100644 --- a/app/organization/festival/urls.py +++ b/app/organization/festival/urls.py @@ -1,8 +1,8 @@ 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 django.contrib import admin from mezzanine.core.views import direct_to_template from mezzanine.conf import settings diff --git a/app/organization/magazine/urls.py b/app/organization/magazine/urls.py new file mode 100644 index 00000000..cea975ae --- /dev/null +++ b/app/organization/magazine/urls.py @@ -0,0 +1,13 @@ +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/media/urls.py b/app/organization/media/urls.py index 50ba7290..4b0faa6a 100644 --- a/app/organization/media/urls.py +++ b/app/organization/media/urls.py @@ -1,13 +1,13 @@ 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 django.contrib import admin from mezzanine.core.views import direct_to_template from mezzanine.conf import settings -from organization.festival.views import * +from organization.media.views import * urlpatterns = [ diff --git a/app/organization/project/migrations/0002_auto_20160707_1053.py b/app/organization/project/migrations/0002_auto_20160707_1053.py index 59768c53..5d78ef15 100644 --- a/app/organization/project/migrations/0002_auto_20160707_1053.py +++ b/app/organization/project/migrations/0002_auto_20160707_1053.py @@ -13,19 +13,19 @@ class Migration(migrations.Migration): dependencies = [ ('sites', '0002_alter_domain_unique'), ('organization project', '0001_initial'), - ('organization structure', '0001_initial'), + ('organization team', '0001_initial'), ] operations = [ migrations.AddField( model_name='project', name='partners', - field=models.ManyToManyField(to='organization structure.Organization', verbose_name='organizations'), + field=models.ManyToManyField(to='organization team.Organization', verbose_name='organizations'), ), migrations.AddField( model_name='project', name='persons', - field=models.ManyToManyField(to='organization structure.Person', verbose_name='persons'), + field=models.ManyToManyField(to='organization team.Person', verbose_name='persons'), ), migrations.AddField( model_name='project', diff --git a/app/organization/project/models.py b/app/organization/project/models.py index 34f61d21..31a7792d 100644 --- a/app/organization/project/models.py +++ b/app/organization/project/models.py @@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _ from mezzanine.core.models import RichText, Displayable, Slugged -from organization.structure.models import Person, Organization +from organization.team.models import Person, Organization class Project(Displayable, RichText): diff --git a/app/organization/project/urls.py b/app/organization/project/urls.py new file mode 100644 index 00000000..cea975ae --- /dev/null +++ b/app/organization/project/urls.py @@ -0,0 +1,13 @@ +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/structure/apps.py b/app/organization/structure/apps.py deleted file mode 100644 index 671fe585..00000000 --- a/app/organization/structure/apps.py +++ /dev/null @@ -1,9 +0,0 @@ -from __future__ import unicode_literals - -from django.apps import AppConfig - - -class StructureConfig(AppConfig): - - name = 'organization.structure' - label = 'organization structure' diff --git a/app/organization/structure/__init__.py b/app/organization/team/__init__.py similarity index 72% rename from app/organization/structure/__init__.py rename to app/organization/team/__init__.py index 64cb6f58..2de9352f 100644 --- a/app/organization/structure/__init__.py +++ b/app/organization/team/__init__.py @@ -7,4 +7,4 @@ from __future__ import unicode_literals from mezzanine import __version__ # noqa -default_app_config = 'organization.structure.apps.StructureConfig' +default_app_config = 'organization.team.apps.teamConfig' diff --git a/app/organization/structure/admin.py b/app/organization/team/admin.py similarity index 100% rename from app/organization/structure/admin.py rename to app/organization/team/admin.py diff --git a/app/organization/team/apps.py b/app/organization/team/apps.py new file mode 100644 index 00000000..81f7caf5 --- /dev/null +++ b/app/organization/team/apps.py @@ -0,0 +1,9 @@ +from __future__ import unicode_literals + +from django.apps import AppConfig + + +class teamConfig(AppConfig): + + name = 'organization.team' + label = 'organization team' diff --git a/app/organization/structure/migrations/0001_initial.py b/app/organization/team/migrations/0001_initial.py similarity index 93% rename from app/organization/structure/migrations/0001_initial.py rename to app/organization/team/migrations/0001_initial.py index eb6a618d..4b4382b0 100644 --- a/app/organization/structure/migrations/0001_initial.py +++ b/app/organization/team/migrations/0001_initial.py @@ -140,7 +140,7 @@ class Migration(migrations.Migration): ('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')), - ('department', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization structure.Department', verbose_name='department')), + ('department', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization team.Department', verbose_name='department')), ], options={ 'abstract': False, @@ -149,45 +149,45 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Organization', fields=[ - ('address_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='organization structure.Address')), + ('address_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='organization team.Address')), ('name', models.CharField(max_length=512, verbose_name='name')), ('description', models.TextField(blank=True, verbose_name='description')), ('url', models.URLField(blank=True, max_length=512, verbose_name='URL')), - ('type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization structure.OrganizationType', verbose_name='organization type')), + ('type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization team.OrganizationType', verbose_name='organization type')), ], options={ 'verbose_name': 'organization', }, - bases=('organization structure.address', models.Model), + bases=('organization team.address', models.Model), ), migrations.AddField( model_name='link', name='link_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organization structure.LinkType', verbose_name='Link type'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organization team.LinkType', verbose_name='Link type'), ), migrations.AddField( model_name='link', name='person', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organization structure.Person', verbose_name='Person'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organization team.Person', verbose_name='Person'), ), migrations.AddField( model_name='activity', name='person', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organization structure.Person', verbose_name='person'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organization team.Person', verbose_name='person'), ), migrations.AddField( model_name='activity', name='teams', - field=models.ManyToManyField(to='organization structure.Team', verbose_name='teams'), + field=models.ManyToManyField(to='organization team.Team', verbose_name='teams'), ), migrations.AddField( model_name='person', name='organization', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization structure.Organization', verbose_name='organization'), + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organization team.Organization', verbose_name='organization'), ), migrations.AddField( model_name='department', name='organization', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organization structure.Organization', verbose_name='organization'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organization team.Organization', verbose_name='organization'), ), ] diff --git a/app/organization/structure/migrations/0002_auto_20160707_1614.py b/app/organization/team/migrations/0002_auto_20160707_1614.py similarity index 92% rename from app/organization/structure/migrations/0002_auto_20160707_1614.py rename to app/organization/team/migrations/0002_auto_20160707_1614.py index 07f60e12..28aa1de8 100644 --- a/app/organization/structure/migrations/0002_auto_20160707_1614.py +++ b/app/organization/team/migrations/0002_auto_20160707_1614.py @@ -9,7 +9,7 @@ import mezzanine.core.fields class Migration(migrations.Migration): dependencies = [ - ('organization structure', '0001_initial'), + ('organization team', '0001_initial'), ] operations = [ diff --git a/app/organization/structure/migrations/__init__.py b/app/organization/team/migrations/__init__.py similarity index 100% rename from app/organization/structure/migrations/__init__.py rename to app/organization/team/migrations/__init__.py diff --git a/app/organization/structure/models.py b/app/organization/team/models.py similarity index 100% rename from app/organization/structure/models.py rename to app/organization/team/models.py diff --git a/app/organization/structure/tests.py b/app/organization/team/tests.py similarity index 100% rename from app/organization/structure/tests.py rename to app/organization/team/tests.py diff --git a/app/organization/team/urls.py b/app/organization/team/urls.py new file mode 100644 index 00000000..ace2c073 --- /dev/null +++ b/app/organization/team/urls.py @@ -0,0 +1,15 @@ +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 + +from organization.team.views import * + + +urlpatterns = [ + +] diff --git a/app/organization/structure/views.py b/app/organization/team/views.py similarity index 100% rename from app/organization/structure/views.py rename to app/organization/team/views.py diff --git a/app/organization/urls.py b/app/organization/urls.py new file mode 100644 index 00000000..adafa016 --- /dev/null +++ b/app/organization/urls.py @@ -0,0 +1,21 @@ +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 django.contrib import admin + +admin.autodiscover() + +from mezzanine.core.views import direct_to_template +from mezzanine.conf import settings + + +urlpatterns = [ + url("^", include('organization.core.urls')), + url("^festival/", include('organization.festival.urls')), + url("^magazine/", include('organization.magazine.urls')), + url("^media/", include('organization.media.urls')), + url("^project/", include('organization.project.urls')), + url("^team/", include('organization.team.urls')), +] diff --git a/app/settings.py b/app/settings.py index 04e094b7..788d0eba 100644 --- a/app/settings.py +++ b/app/settings.py @@ -219,7 +219,7 @@ INSTALLED_APPS = [ "meta", "mezzanine_agenda", "organization.core", - "organization.structure", + "organization.team", "organization.festival", "organization.magazine", "organization.media", diff --git a/app/urls.py b/app/urls.py index 10df47eb..6e0a5d17 100644 --- a/app/urls.py +++ b/app/urls.py @@ -27,8 +27,11 @@ if settings.USE_MODELTRANSLATION: urlpatterns += [ - url(r'^festival/', include('organization.festival.urls')), + # App urls + + url("^", include('organization.urls')), url("^%s/" % settings.EVENT_SLUG, include("mezzanine_agenda.urls")), + url("^styles/$", direct_to_template, {"template": "styles.html"}, name="styles"), # We don't want to presume how your homepage works, so here are a # few patterns you can use to set it up. @@ -40,8 +43,7 @@ urlpatterns += [ # one homepage pattern, so if you use a different one, comment this # one out. - url("^styles/$", direct_to_template, {"template": "styles.html"}, name="styles"), - url("^$", direct_to_template, {"template": "index.html"}, name="home"), + # url("^$", direct_to_template, {"template": "index.html"}, name="home"), # HOMEPAGE AS AN EDITABLE PAGE IN THE PAGE TREE # --------------------------------------------- -- 2.39.5