From f10f5b413011361cbab3c13699e69e0f319ed775 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 12 Sep 2016 17:42:56 +0200 Subject: [PATCH] Rename products module into shop --- app/organization/products/apps.py | 9 --------- app/organization/projects/models.py | 2 -- app/organization/{products => shop}/__init__.py | 2 +- app/organization/{products => shop}/admin.py | 0 app/organization/shop/apps.py | 9 +++++++++ .../{products => shop}/migrations/__init__.py | 0 app/organization/{products => shop}/models.py | 0 app/organization/{products => shop}/tests.py | 0 app/organization/{products => shop}/translation.py | 0 app/organization/{products => shop}/urls.py | 4 ++-- app/organization/{products => shop}/views.py | 0 app/organization/urls.py | 1 + app/settings.py | 4 ++-- 13 files changed, 15 insertions(+), 16 deletions(-) delete mode 100644 app/organization/products/apps.py rename app/organization/{products => shop}/__init__.py (73%) rename app/organization/{products => shop}/admin.py (100%) create mode 100644 app/organization/shop/apps.py rename app/organization/{products => shop}/migrations/__init__.py (100%) rename app/organization/{products => shop}/models.py (100%) rename app/organization/{products => shop}/tests.py (100%) rename app/organization/{products => shop}/translation.py (100%) rename app/organization/{products => shop}/urls.py (64%) rename app/organization/{products => shop}/views.py (100%) diff --git a/app/organization/products/apps.py b/app/organization/products/apps.py deleted file mode 100644 index d198b2d6..00000000 --- a/app/organization/products/apps.py +++ /dev/null @@ -1,9 +0,0 @@ -from __future__ import unicode_literals - -from django.apps import AppConfig - - -class ProductConfig(AppConfig): - - name = 'organization.products' - label = 'organization-products' diff --git a/app/organization/projects/models.py b/app/organization/projects/models.py index ae0fc91f..6d9e8d17 100644 --- a/app/organization/projects/models.py +++ b/app/organization/projects/models.py @@ -52,13 +52,11 @@ class ProjectAudio(Audio): project = models.ForeignKey(Project, verbose_name=_('project'), related_name='audios', blank=True, null=True, on_delete=models.SET_NULL) - class ProjectVideo(Video): project = models.ForeignKey(Project, verbose_name=_('project'), related_name='videos', blank=True, null=True, on_delete=models.SET_NULL) - class ProjectLink(Link): project = models.ForeignKey(Project, verbose_name=_('project'), related_name='links', blank=True, null=True, on_delete=models.SET_NULL) diff --git a/app/organization/products/__init__.py b/app/organization/shop/__init__.py similarity index 73% rename from app/organization/products/__init__.py rename to app/organization/shop/__init__.py index 4500ae1e..fd3dc698 100644 --- a/app/organization/products/__init__.py +++ b/app/organization/shop/__init__.py @@ -7,4 +7,4 @@ from __future__ import unicode_literals from mezzanine import __version__ # noqa -default_app_config = 'organization.products.apps.ProductConfig' +default_app_config = 'organization.shop.apps.ShopConfig' diff --git a/app/organization/products/admin.py b/app/organization/shop/admin.py similarity index 100% rename from app/organization/products/admin.py rename to app/organization/shop/admin.py diff --git a/app/organization/shop/apps.py b/app/organization/shop/apps.py new file mode 100644 index 00000000..adf0a5d0 --- /dev/null +++ b/app/organization/shop/apps.py @@ -0,0 +1,9 @@ +from __future__ import unicode_literals + +from django.apps import AppConfig + + +class ShopConfig(AppConfig): + + name = 'organization.shop' + label = 'organization-shop' diff --git a/app/organization/products/migrations/__init__.py b/app/organization/shop/migrations/__init__.py similarity index 100% rename from app/organization/products/migrations/__init__.py rename to app/organization/shop/migrations/__init__.py diff --git a/app/organization/products/models.py b/app/organization/shop/models.py similarity index 100% rename from app/organization/products/models.py rename to app/organization/shop/models.py diff --git a/app/organization/products/tests.py b/app/organization/shop/tests.py similarity index 100% rename from app/organization/products/tests.py rename to app/organization/shop/tests.py diff --git a/app/organization/products/translation.py b/app/organization/shop/translation.py similarity index 100% rename from app/organization/products/translation.py rename to app/organization/shop/translation.py diff --git a/app/organization/products/urls.py b/app/organization/shop/urls.py similarity index 64% rename from app/organization/products/urls.py rename to app/organization/shop/urls.py index 75e2f156..6164c0bb 100644 --- a/app/organization/products/urls.py +++ b/app/organization/shop/urls.py @@ -7,8 +7,8 @@ from django.conf.urls.i18n import i18n_patterns from mezzanine.core.views import direct_to_template from mezzanine.conf import settings -from organization.projects.views import * +from organization.shop.views import * urlpatterns = [ - # url("^project/detail/(?P.*)/$", ProjectDetailView.as_view(), name='organization-project-detail'), + url("^shop/", include("cartridge.shop.urls")), ] diff --git a/app/organization/products/views.py b/app/organization/shop/views.py similarity index 100% rename from app/organization/products/views.py rename to app/organization/shop/views.py diff --git a/app/organization/urls.py b/app/organization/urls.py index 5ed30ea1..d197a151 100644 --- a/app/organization/urls.py +++ b/app/organization/urls.py @@ -21,4 +21,5 @@ urlpatterns = [ url("^", include('organization.network.urls')), url("^", include('organization.agenda.urls')), url("^", include('organization.job.urls')), + url("^", include('organization.shop.urls')), ] diff --git a/app/settings.py b/app/settings.py index 22f53288..12f99dd5 100644 --- a/app/settings.py +++ b/app/settings.py @@ -220,10 +220,10 @@ INSTALLED_APPS = [ "mezzanine.twitter", "mezzanine.accounts", # "mezzanine.mobile", + "cartridge.shop", # "eve", 'djangobower', "meta", - "cartridge.shop", "mezzanine_agenda", # "orderable", "organization.core", @@ -234,7 +234,7 @@ INSTALLED_APPS = [ "organization.magazine", "organization.projects", "organization.agenda", - "organization.products", + "organization.shop", "organization.job", ] -- 2.39.5