Projet

Général

Profil

0001-replace-use-of-django-select2-by-xstatic-select2.patch

Benjamin Dauvergne, 07 mars 2017 23:32

Télécharger (2,48 ko)

Voir les différences:

Subject: [PATCH] replace use of django-select2 by xstatic-select2

 debian/control                  | 1 +
 setup.py                        | 2 +-
 welco/settings.py               | 2 +-
 welco/templates/welco/base.html | 5 +++--
 4 files changed, 6 insertions(+), 4 deletions(-)
debian/control
26 26
    python-django-tenant-schemas,
27 27
    python-psycopg2,
28 28
    python-django-mellon,
29
    python-xstatic-select2,
29 30
    gunicorn,
30 31
    graphicsmagick
31 32
Recommends: nginx, postgresql
setup.py
99 99
    ],
100 100
    install_requires=['django>=1.7, <1.9',
101 101
        'gadjo',
102
        'django-select2',
103 102
        'django-ckeditor<4.5.3',
104 103
        'django-haystack',
105 104
        'django-reversion==1.8.7',
106 105
        'django-taggit',
107 106
        'requests',
108 107
        'whoosh',
108
        'XStatic-Select2',
109 109
        ],
110 110
    zip_safe=False,
111 111
    cmdclass={
welco/settings.py
41 41
    'django.contrib.sessions',
42 42
    'django.contrib.messages',
43 43
    'django.contrib.staticfiles',
44
    'django_select2',
45 44
    'ckeditor',
46 45
    'haystack',
47 46
    'reversion',
......
53 52
    'welco.kb',
54 53
    'welco.contacts',
55 54
    'gadjo',
55
    'xstatic.pkg.select2',
56 56
)
57 57

  
58 58
MIDDLEWARE_CLASSES = (
welco/templates/welco/base.html
1 1
{% extends "gadjo/base.html" %}
2
{% load i18n static django_select2_tags %}
2
{% load i18n static gadjo %}
3 3

  
4 4
{% block page-title %}{% firstof site_title "Welco" %}{% endblock %}
5 5
{% block site-title %}{% firstof site_title "Welco" %}{% endblock %}
......
19 19
{{ block.super }}
20 20
<script src="{% static "js/datepicker-fr.js" %}"></script>
21 21
<script src="{% static "js/welco.js" %}"></script>
22
{% import_django_select2_js_css %}
22
<script src="{% xstatic "select2.js" "select2.min.js" %}"></script>
23
<link rel="stylesheet" href="{% xstatic "select2.css" "select2.min.css" %}"/>
23 24
{% endblock %}
24
-