Fix inlines ordering using a custom mezzanine version upgrading admin jquery(-ui...

diff --git a/app/local_settings.py b/app/local_settings.py
index bed65313a13e01512cc3b7f565a3f1430ad7ccae..63179b76ea522bb3c30cb2c128811cabd414d0f6 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -140,3 +140,7 @@ DEBUG_TOOLBAR_PANELS = [
     'debug_toolbar.panels.logging.LoggingPanel',
     'debug_toolbar.panels.redirects.RedirectsPanel',
 ]
+
+GRAPPELLI_INSTALLED = True
+JQUERY_FILENAME = 'jquery-3.1.0.min.js'
+JQUERY_UI_FILENAME = 'jquery-ui-1.12.0.min.js'

diff --git a/app/organization/magazine/models.py b/app/organization/magazine/models.py
index 8bcc131426046416aeb57dd3d6622f8423dbe989..91ad1f1b90b8523460418ea619cf1ce03c308a45 100644 (file)
--- a/app/organization/magazine/models.py
+++ b/app/organization/magazine/models.py
@@ -34,6 +34,7 @@ class Article(BlogPost, Photo):
                                  verbose_name=_("Related articles"), blank=True)
 
     model_name = _('article')
+
     def get_absolute_url(self):
         return reverse("magazine-article-detail", kwargs={"slug": self.slug})
 

diff --git a/app/organization/project/admin.py b/app/organization/project/admin.py
index 0f3a33472714b41bf4665696e5c97999354ad12e..f0451cf6ed13ead2e5cd793ab9248c00cc603ca6 100644 (file)
--- a/app/organization/project/admin.py
+++ b/app/organization/project/admin.py
@@ -13,7 +13,7 @@ class ProjectLinkInline(StackedDynamicInlineAdmin):
     model = ProjectLink
 
 
-class ProjectImageInline(StackedDynamicInlineAdmin):
+class ProjectImageInline(TabularDynamicInlineAdmin):
 
     model = ProjectImage
 

diff --git a/app/organization/project/models.py b/app/organization/project/models.py
index e3556932761332a199e9a6799a20962ce664f4cd..4cb42c8dfe553591ff89df2f09470a5720cedc18 100644 (file)
--- a/app/organization/project/models.py
+++ b/app/organization/project/models.py
@@ -24,6 +24,9 @@ class Project(Displayable, RichText):
     def __str__(self):
         return self.title
 
+    def get_absolute_url(self):
+        return reverse("organization-project-detail", kwargs={"slug": self.slug})
+
 
 class ProjectBlock(Block):
 

diff --git a/app/organization/project/urls.py b/app/organization/project/urls.py
index cea975aeae69e65a4209ae4445dea0d2a8be0f9b..0ccbd1106d1f840a70512780a307f71c9e0cb971 100644 (file)
--- a/app/organization/project/urls.py
+++ b/app/organization/project/urls.py
@@ -7,7 +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.project.views import *
 
 urlpatterns = [
-
+    url("^project/detail/(?P<slug>.*)/$", ProjectDetailView.as_view(), name='organization-project-detail'),
 ]

diff --git a/app/organization/project/views.py b/app/organization/project/views.py
index 5d078e3a4ff284f1fe0d522e3a0a5ec7ffa38a9f..73898ff4bdae68626869b8afafedea12c9af6cd8 100644 (file)
--- a/app/organization/project/views.py
+++ b/app/organization/project/views.py
@@ -1,5 +1,6 @@
 from django.shortcuts import render
 
+from organization.project.models import *
 from organization.core.views import *
 
 

diff --git a/app/scripts/app.sh b/app/scripts/app.sh
index 96d6ad6f179e5d4f845a6f49d7a7c0d103829011..28011c693fefca871c68745bdc5ab6d89e2ea5e5 100644 (file)
--- a/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@ -24,6 +24,8 @@ patterns='*.js;*.css;*.jpg;*.jpeg;*.gif;*.png;*.svg;*.ttf;*.eot;*.woff;*.woff2'
 # pip install django-querysetsequence
 pip install django-autocomplete-light django-querysetsequence
 /usr/bin/yes | pip uninstall django-orderable
+# /usr/bin/yes | pip uninstall grappelli-safe
+# pip install grappelli-safe
 
 chown -R $uid:$gid $media
 

diff --git a/app/settings.py b/app/settings.py
index f0e6d78245012a4157e0a153143e5607d54e615d..0d44c21e7a430a78d4b2a0af6b03f6d3955bf1a0 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -306,7 +306,6 @@ MIDDLEWARE_CLASSES = (
 PACKAGE_NAME_FILEBROWSER = "filebrowser_safe"
 PACKAGE_NAME_GRAPPELLI = "grappelli_safe"
 
-
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',

diff --git a/app/templates/includes/footer_scripts.html b/app/templates/includes/footer_scripts.html
index 7cfda83e55976637fbf2e3886031a2fab5db1cb5..fe192a9e65baca0a2e3e59f1ca26e27af044116f 100644 (file)
--- a/app/templates/includes/footer_scripts.html
+++ b/app/templates/includes/footer_scripts.html
@@ -1,7 +1,7 @@
 {% load mezzanine_tags i18n staticfiles %}
 
 {% compress js %}
-    <!--<script src="{% static "vendors/jquery/dist/jquery.min.js" %}"></script>-->
+    <script src="{% static "vendors/jquery/dist/jquery.min.js" %}"></script>
     <script src="{% static "vendors/overflow.js/js/overflow.js" %}"></script>
     <script src="{% static "vendors/sticky-kit/jquery.sticky-kit.js" %}"></script>
     <script src="{% static "vendors/jquery-throttle-debounce/jquery.ba-throttle-debounce.js" %}"></script>

diff --git a/docker-compose.yml b/docker-compose.yml
index 7ca02a7a69dee04bc54ac9eda5c8cb4f265244d5..cf3df696a6cc49bdd449480ddba51d5aa8da83d3 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,6 +44,7 @@ app:
   volumes:
     - ./app/:/srv/app
     - ./lib/mezzanine-agenda/:/srv/lib/mezzanine-agenda
+    - ./lib/mezzanine/:/srv/lib/mezzanine
   volumes_from:
     - data
   expose:

diff --git a/requirements-dev.txt b/requirements-dev.txt
index bc7ae6d60c2e23c8d3794da2e25a8cc8131607f5..ab15f0e446c89f7dbf4e9a3062d8b20dc7379b4c 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,5 +1,5 @@
 -e git+https://github.com/yomguy/mezzanine-agenda.git#egg=mezzanine-agenda-0.2.2
-#-e git+https://github.com/stephenmcd/mezzanine.git@master#egg=mezzanine-4.2.master
+-e git+https://github.com/yomguy/mezzanine.git@9917784#egg=mezzanine-4.2-dev
 -e git+https://github.com/stephenmcd/grappelli-safe.git@dynamic_stacked#egg=grappelli-safe-0.4.2
 #-e git+https://github.com/yourlabs/django-autocomplete-light.git#egg=django-autocomplete-light
 #https://forge.ircam.fr/p/django-eve/source/download/dev/