From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 15 Sep 2016 16:08:22 +0000 (+0200)
Subject: Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ed978b230748734089d0c864b1bb295c35b21311;p=mezzo.git

Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev

Conflicts:
	app/organization/shop/urls.py
	app/organization/urls.py
---

ed978b230748734089d0c864b1bb295c35b21311
diff --cc app/organization/shop/urls.py
index 6164c0bb,00000000..524bc486
mode 100644,000000..100644
--- a/app/organization/shop/urls.py
+++ b/app/organization/shop/urls.py
@@@ -1,14 -1,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.shop.views import *
 +
 +urlpatterns = [
 +    url("^shop/", include("cartridge.shop.urls")),
++    url("^product/(?P<slug>.*)/$", ProductDetailView.as_view(), name='shop_product'),
 +]
diff --cc app/organization/shop/views.py
index 44b18f22,00000000..d338301c
mode 100644,000000..100644
--- a/app/organization/shop/views.py
+++ b/app/organization/shop/views.py
@@@ -1,17 -1,0 +1,22 @@@
 +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'
++
++
++class ProductDetailView(SlugMixin, DetailView):
++
++    pass