From: Guillaume Pellerin Date: Mon, 12 Sep 2016 15:42:56 +0000 (+0200) Subject: Rename products module into shop X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f10f5b413011361cbab3c13699e69e0f319ed775;p=mezzo.git Rename products module into shop --- diff --git a/app/organization/products/__init__.py b/app/organization/products/__init__.py deleted file mode 100644 index 4500ae1e..00000000 --- a/app/organization/products/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -""" -Provides abstract models and admin features used throughout the various -Mezzanine apps. -""" -from __future__ import unicode_literals - -from mezzanine import __version__ # noqa - - -default_app_config = 'organization.products.apps.ProductConfig' diff --git a/app/organization/products/admin.py b/app/organization/products/admin.py deleted file mode 100644 index 0d9f2e20..00000000 --- a/app/organization/products/admin.py +++ /dev/null @@ -1,10 +0,0 @@ -from copy import deepcopy - -from django.contrib import admin -from django.utils.translation import ugettext_lazy as _ - -from mezzanine.core.admin import * - -from organization.projects.models import * -from organization.pages.models import * -from organization.media.models import Video, Audio 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/products/migrations/__init__.py b/app/organization/products/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/app/organization/products/models.py b/app/organization/products/models.py deleted file mode 100644 index cd51d4c3..00000000 --- a/app/organization/products/models.py +++ /dev/null @@ -1,9 +0,0 @@ -from __future__ import unicode_literals - -from django.db import models -from django.utils.translation import ugettext_lazy as _ - -from mezzanine.core.models import RichText, Displayable, Slugged, Orderable - -from organization.core.models import * -from organization.pages.models import * diff --git a/app/organization/products/tests.py b/app/organization/products/tests.py deleted file mode 100644 index 7ce503c2..00000000 --- a/app/organization/products/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/app/organization/products/translation.py b/app/organization/products/translation.py deleted file mode 100644 index 60c2e5d3..00000000 --- a/app/organization/products/translation.py +++ /dev/null @@ -1,11 +0,0 @@ -from modeltranslation.translator import translator, register, TranslationOptions - -from organization.projects.models import * - - -# @register(Project) -# class ProjectTranslationOptions(TranslationOptions): -# -# fields = ('title', 'description', 'content') -# -# diff --git a/app/organization/products/urls.py b/app/organization/products/urls.py deleted file mode 100644 index 75e2f156..00000000 --- a/app/organization/products/urls.py +++ /dev/null @@ -1,14 +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 - -from organization.projects.views import * - -urlpatterns = [ - # url("^project/detail/(?P.*)/$", ProjectDetailView.as_view(), name='organization-project-detail'), -] diff --git a/app/organization/products/views.py b/app/organization/products/views.py deleted file mode 100644 index 44b18f22..00000000 --- a/app/organization/products/views.py +++ /dev/null @@ -1,17 +0,0 @@ -from django.shortcuts import render - -from organization.projects.models import * -from organization.core.views import * - - -# class ProjectListView(ListView): -# -# model = Project -# template_name='projects/project_list.html' -# -# -# class ProjectDetailView(SlugMixin, DetailView): -# -# model = Project -# template_name='projects/project_detail.html' -# context_object_name = 'project' 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/shop/__init__.py b/app/organization/shop/__init__.py new file mode 100644 index 00000000..fd3dc698 --- /dev/null +++ b/app/organization/shop/__init__.py @@ -0,0 +1,10 @@ +""" +Provides abstract models and admin features used throughout the various +Mezzanine apps. +""" +from __future__ import unicode_literals + +from mezzanine import __version__ # noqa + + +default_app_config = 'organization.shop.apps.ShopConfig' diff --git a/app/organization/shop/admin.py b/app/organization/shop/admin.py new file mode 100644 index 00000000..0d9f2e20 --- /dev/null +++ b/app/organization/shop/admin.py @@ -0,0 +1,10 @@ +from copy import deepcopy + +from django.contrib import admin +from django.utils.translation import ugettext_lazy as _ + +from mezzanine.core.admin import * + +from organization.projects.models import * +from organization.pages.models import * +from organization.media.models import Video, Audio 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/shop/migrations/__init__.py b/app/organization/shop/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/app/organization/shop/models.py b/app/organization/shop/models.py new file mode 100644 index 00000000..cd51d4c3 --- /dev/null +++ b/app/organization/shop/models.py @@ -0,0 +1,9 @@ +from __future__ import unicode_literals + +from django.db import models +from django.utils.translation import ugettext_lazy as _ + +from mezzanine.core.models import RichText, Displayable, Slugged, Orderable + +from organization.core.models import * +from organization.pages.models import * diff --git a/app/organization/shop/tests.py b/app/organization/shop/tests.py new file mode 100644 index 00000000..7ce503c2 --- /dev/null +++ b/app/organization/shop/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/app/organization/shop/translation.py b/app/organization/shop/translation.py new file mode 100644 index 00000000..60c2e5d3 --- /dev/null +++ b/app/organization/shop/translation.py @@ -0,0 +1,11 @@ +from modeltranslation.translator import translator, register, TranslationOptions + +from organization.projects.models import * + + +# @register(Project) +# class ProjectTranslationOptions(TranslationOptions): +# +# fields = ('title', 'description', 'content') +# +# diff --git a/app/organization/shop/urls.py b/app/organization/shop/urls.py new file mode 100644 index 00000000..6164c0bb --- /dev/null +++ b/app/organization/shop/urls.py @@ -0,0 +1,14 @@ +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.shop.views import * + +urlpatterns = [ + url("^shop/", include("cartridge.shop.urls")), +] diff --git a/app/organization/shop/views.py b/app/organization/shop/views.py new file mode 100644 index 00000000..44b18f22 --- /dev/null +++ b/app/organization/shop/views.py @@ -0,0 +1,17 @@ +from django.shortcuts import render + +from organization.projects.models import * +from organization.core.views import * + + +# class ProjectListView(ListView): +# +# model = Project +# template_name='projects/project_list.html' +# +# +# class ProjectDetailView(SlugMixin, DetailView): +# +# model = Project +# template_name='projects/project_detail.html' +# context_object_name = 'project' 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", ]