]> git.parisson.com Git - telemeta.git/commitdiff
End lowercase + english
authormathieu <mathieu.boye28@gmail.com>
Wed, 18 May 2016 10:36:29 +0000 (12:36 +0200)
committermathieu <mathieu.boye28@gmail.com>
Wed, 18 May 2016 10:36:29 +0000 (12:36 +0200)
telemeta/forms/boolean_form.py
telemeta/templates/search/advanceSearch.html
telemeta/templates/telemeta/base.html
telemeta/templates/telemeta/mediaitem_detail.html
telemeta/templates/telemeta/mediaitem_list.html
telemeta/urls.py
telemeta/util/search_signals.py
telemeta/views/item.py
telemeta/views/search.py

index fff4ef1500318606e4d103a3298c343acde893fd..02e47b846ab791c66b8f2f7a54089530be7536f3 100644 (file)
@@ -2,7 +2,7 @@ from django import forms
 
 class BooleanSearch(forms.Form):
 
-    def getBrackets(dir):
+    def get_brackets(dir):
         list = []
         for i in range(4):
             brackets = ""
@@ -15,8 +15,8 @@ class BooleanSearch(forms.Form):
         return list
 
     boolean = forms.ChoiceField(choices=[('ET', 'ET',), ('OU', 'OU',)], label='', required=False)
-    startBracket = forms.ChoiceField(label='',choices=getBrackets('left'), required=False)
-    textField = forms.CharField(label='', widget=forms.TextInput(attrs={'required':''}))
-    endBracket = forms.ChoiceField(label='', choices=getBrackets('right'), required=False)
+    start_bracket = forms.ChoiceField(label='', choices=get_brackets('left'), required=False)
+    text_field = forms.CharField(label='', widget=forms.TextInput(attrs={'required': ''}))
+    end_bracket = forms.ChoiceField(label='', choices=get_brackets('right'), required=False)
 
 
index df96a4a6f31dfd88e20d1a398a36582d1c0f1cb9..5d7ae3def60ffa389f837d315898346e8d3f4ab4 100644 (file)
@@ -381,12 +381,12 @@ $(function() {
 
     function deleteField(e) {
         e.preventDefault();
-        var nombre = $('input[name*="textField"]').length;
-        if(nombre==3){
+        var number = $('input[name*="textField"]').length;
+        if(number==3){
             $('#del').remove();
         }
-        $('#bloc-'+(nombre-1)).remove();
-        $('#id_form-TOTAL_FORMS').attr('value', nombre-1);
+        $('#bloc-'+(number-1)).remove();
+        $('#id_form-TOTAL_FORMS').attr('value', number-1);
 
     }
 
index 9da922de2d723b5bfb2653b33b060732430387d5..4d149538810f1c386b5c675af3bd9fd40eae698b 100644 (file)
 {% load bootstrap3 %}
 {% settings_value 'INSTALLED_APPS' as INSTALLED_APPS %}
 {% if 'googletools' in INSTALLED_APPS %}
-{% load googletools %}
+    {% load googletools %}
 {% endif %}
 
 {% get_current_language as LANGUAGE_CODE %}
 {% get_available_languages as LANGUAGES %}
 {% get_current_language_bidi as LANGUAGE_BIDI %}
 
-<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}"
+      {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
 
 <head>
-<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
-<meta charset="utf-8" />
-<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta http-equiv="Content-type" content="text/html;charset=UTF-8"/>
+    <meta charset="utf-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 
-{% block analytics %}
-{% if 'googletools' in INSTALLED_APPS %}
-{% site_verification_code %}
-{% analytics_code %}
-{% endif %}
-{% endblock analytics %}
+    {% block analytics %}
+        {% if 'googletools' in INSTALLED_APPS %}
+            {% site_verification_code %}
+            {% analytics_code %}
+        {% endif %}
+    {% endblock analytics %}
 
-<link rel="alternate" href="/rss" title="RSS 2.0" type="application/rss+xml" />
-<link rel="icon" href="{{ STATIC_URL }}telemeta/images/favicon.ico"/>
+    <link rel="alternate" href="/rss" title="RSS 2.0" type="application/rss+xml"/>
+    <link rel="icon" href="{{ STATIC_URL }}telemeta/images/favicon.ico"/>
 
-<title>{%block head_title %}{% organization %} - {% description %}{% endblock %}</title>
+    <title>{% block head_title %}{% organization %} - {% description %}{% endblock %}</title>
 
-{% block stylesheets %}
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/telemeta.css" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}bootstrap/dist/css/bootstrap.min.css" />
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/telemeta-more.css" />
+    {% block stylesheets %}
+        <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/telemeta.css"/>
+        <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}bootstrap/dist/css/bootstrap.min.css"/>
+        <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/telemeta-more.css"/>
 
-<!--[if IE]>
+        <!--[if IE]>
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/telemeta_ie.css" />
 <![endif]-->
-<!--[if lte IE 6]>
+        <!--[if lte IE 6]>
 <link rel="stylesheet"type="text/css" href="{{ STATIC_URL }}telemeta/css/telemeta_ie6.css" />
 <![endif]-->
-{% endblock %}
+    {% endblock %}
 
-{% block extra_stylesheets %}{% endblock %}
+    {% block extra_stylesheets %}{% endblock %}
 
-{% block javascript %}
-<script src="{% url "django.views.i18n.javascript_catalog" %}" type="text/javascript"></script>
-<script src="{{ STATIC_URL }}jquery/dist/jquery.min.js" type="text/javascript"></script>
-<script src="{{ STATIC_URL }}telemeta/js/locale.js" type="text/javascript"></script>
-<script src="{{ STATIC_URL }}telemeta/js/application.js" type="text/javascript"></script>
-<script src="{{ STATIC_URL }}bootstrap/dist/js/bootstrap.min.js" type="text/javascript"></script>
+    {% block javascript %}
+        <script src="{% url "django.views.i18n.javascript_catalog" %}" type="text/javascript"></script>
+        <script src="{{ STATIC_URL }}jquery/dist/jquery.min.js" type="text/javascript"></script>
+        <script src="{{ STATIC_URL }}telemeta/js/locale.js" type="text/javascript"></script>
+        <script src="{{ STATIC_URL }}telemeta/js/application.js" type="text/javascript"></script>
+        <script src="{{ STATIC_URL }}bootstrap/dist/js/bootstrap.min.js" type="text/javascript"></script>
 
-{% if user.is_authenticated %}
-<script type='text/javascript'>var CURRENT_USER_NAME="{{ user.username }}";</script>
-{% else %}
-<script type='text/javascript'>var CURRENT_USER_NAME=undefined;</script>
-{% endif %}
-{% endblock %}
+        {% if user.is_authenticated %}
+            <script type='text/javascript'>var CURRENT_USER_NAME = "{{ user.username }}";</script>
+        {% else %}
+            <script type='text/javascript'>var CURRENT_USER_NAME = undefined;</script>
+        {% endif %}
+    {% endblock %}
 
-{% block extra_javascript %}{% endblock %}
+    {% block extra_javascript %}{% endblock %}
 </head>
 
 <body>
 {% block layout %}
-<div id="layout">
-{% block header %}
-<div id="header">
-<div id="logo">
-{% block logo %}
-<a href="{% url "telemeta-home" %}"><img src="{% logo_url %}" alt="Telemeta" /></a>
-{% endblock %}
-</div>
-
-<div id="auth_info"  {% if LANGUAGE_BIDI %}style="left : 1.1em;"{% else %}style="right : 1.1em;"{% endif %}>
-{% if user.is_authenticated %}
-<img src="{{ STATIC_URL }}telemeta/images/user.png" alt="user" style="vertical-align:middle" />
-{% trans "Welcome" %},
-<a href="{% url "telemeta-profile-detail" user.username %}">
-{% if user.first_name or user.last_name %}
-{{ user.first_name }} {{ user.last_name }}</a> |
-{% else %}
-  {{ user.username }}
-{% endif %}
-<a href="{% url "telemeta-flatpage" "help" %}">{% trans "Help" %}</a> |
-<a href="{% url "telemeta-logout" %}">{% trans "Sign out" %}
-<img src="{{ STATIC_URL }}telemeta/images/logout.png" alt="logout" style="vertical-align:middle" /></a>
-{% else %}
-<a href="{% url "telemeta-flatpage" "help" %}">{% trans "Help" %}</a> |
-<a href="{% url "telemeta-login" %}">{% trans "Sign in" %}</a>
-{% endif %}
-
-</div>
-
-{% block search %}
-<div id="quick_search">
-<form action="{% url "haystack_search" %}" id="_quickSearchForm" method="get">
-    <div class="input-group">
-       <input class="form-control" id="id_q" name="q" type="text" /><span class="input-group-btn"><button type="submit" id="btn" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button></span>
+    <div id="layout">
+        {% block header %}
+            <div id="header">
+                <div id="logo">
+                    {% block logo %}
+                        <a href="{% url "telemeta-home" %}"><img src="{% logo_url %}" alt="Telemeta"/></a>
+                    {% endblock %}
+                </div>
+
+                <div id="auth_info" {% if LANGUAGE_BIDI %}style="left : 1.1em;"
+                     {% else %}style="right : 1.1em;"{% endif %}>
+                    {% if user.is_authenticated %}
+                        <img src="{{ STATIC_URL }}telemeta/images/user.png" alt="user" style="vertical-align:middle"/>
+                        {% trans "Welcome" %},
+                        <a href="{% url "telemeta-profile-detail" user.username %}">
+                            {% if user.first_name or user.last_name %}
+                                {{ user.first_name }} {{ user.last_name }}</a> |
+                            {% else %}
+                                {{ user.username }}
+                            {% endif %}
+                        <a href="{% url "telemeta-flatpage" "help" %}">{% trans "Help" %}</a> |
+                        <a href="{% url "telemeta-logout" %}">{% trans "Sign out" %}
+                            <img src="{{ STATIC_URL }}telemeta/images/logout.png" alt="logout"
+                                 style="vertical-align:middle"/></a>
+                    {% else %}
+                        <a href="{% url "telemeta-flatpage" "help" %}">{% trans "Help" %}</a> |
+                        <a href="{% url "telemeta-login" %}">{% trans "Sign in" %}</a>
+                    {% endif %}
+
+                </div>
+
+                {% block search %}
+                    <div id="quick_search">
+                        <form action="{% url "haystack_search" %}" id="_quickSearchForm" method="get">
+                            <div class="input-group">
+                                <input class="form-control" id="id_q" name="q" type="text"/><span
+                                    class="input-group-btn"><button type="submit" id="btn" class="btn btn-default"><span
+                                    class="glyphicon glyphicon-search"></span></button></span>
+                            </div>
+                        </form>
+                    </div>
+                {% endblock search %}
+
+                <div id="menu">
+                    {% block menu %}
+
+                        {# spaces between li and a elements breaks layout #}
+
+                        <ul id="nav">
+                            {% if user.is_authenticated %}
+                                <li><a href="{% url "telemeta-desk-lists" %}" class="blue">{% trans "Desk" %}</a></li>
+                            {% else %}
+                                <li><a href="{% url "telemeta-home" %}" class="blue">{% trans "Home" %}</a></li>
+                            {% endif %}
+
+                            <li><a href="#archives#" class="green">{% trans "Archives" %}</a>
+                                <ul>
+                                    <li><a href="{% url "telemeta-resource-list" "fonds" %}">{% trans "Fonds" %}</a>
+                                    </li>
+                                    <li><a href="{% url "telemeta-resource-list" "corpus" %}">{% trans "Corpus" %}</a>
+                                    </li>
+                                    <li><a href="{% url "telemeta-collections" %}">{% trans "Collections" %}</a></li>
+                                    <li><a href="{% url "telemeta-items" %}">{% trans "Items" %}</a></li>
+                                </ul>
+                            </li>
+
+                            <li><a href="{% url "telemeta-geo-continents" %}"
+                                   class="yellow">{% trans "Geo Navigator" %}</a></li>
+
+                            <li><a href="{% url "haystack_advance_search" %}"
+                                   class="orange">{% trans "Advanced search" %}</a></li>
+                            {% if user.is_authenticated %}
+                                {% if user.is_staff or not perms.telemeta.can_not_view_users_and_profiles %}
+                                    <li><a href="{% url "telemeta-users" %}" class="red">{% trans "Users" %}</a></li>
+                                {% endif %}
+                            {% endif %}
+                            {% if user.is_staff %}
+                                <li><a href="#admin#" class="violet">{% trans "Admin" %}</a>
+                                    <ul>
+                                        <li><a href="{% url "telemeta-home" %}admin/django/"
+                                               target="_blank">{% trans "General" context "admin" %}</a></li>
+                                        <li>
+                                            <a href="{% url "telemeta-admin-enumerations" %}">{% trans "Enumerations" %}</a>
+                                        </li>
+                                        <li><a href="{% url "telemeta-instrument-edit" %}">{% trans "Instruments" %}</a>
+                                        </li>
+                                        <li>
+                                            <a href="{% url "telemeta-instrument-alias-edit" %}">{% trans "Instrument aliases" %}</a>
+                                        </li>
+                                    </ul>
+                                </li>
+                            {% endif %}
+                        </ul>
+                        <form id="formlang" action="/i18n/setlang/" method="post" style="display:inline-block;">
+
+                            {% csrf_token %}
+
+                            <input name="next" type="hidden" value="{% url 'telemeta-home' %}"/>
+
+                            <select name="language" style="color:#6a0307">
+
+                                {% for lang in LANGUAGES %}
+
+                                    <option value="{{ lang.0 }}">{{ lang.1 }}</option>
+
+                                {% endfor %}
+
+                            </select>
+
+
+                            <input type="submit" value="Ok"/>
+
+                        </form>
+
+
+                    {% endblock menu %}
+                </div>
+            </div>
+        {% endblock header %}
+
+        {% block postman_menu %}
+        {% endblock postman_menu %}
+
+        {% if breadcrumbs %}
+            <ul class="breadcrumbs">
+                <li><a href="#">Home</a></li>
+                <li><a href="#">Features</a></li>
+                <li class="unavailable"><a href="#">Gene Splicing</a></li>
+                <li class="current"><a href="#">Cloning</a></li>
+            </ul>
+        {% endif %}
+
+        <div id="content">
+            <table id="content_header">
+                <tr>
+                    <td class="leftcol"><h1>{% block title %}{% endblock %}</h1></td>
+                    {% block rightcol %}
+                        <td class="rightcol" {% if LANGUAGE_BIDI %}style="float : left;"
+                            {% else %}style="float : right;"{% endif %}>{% block title_buttons %}{% endblock %}</td>
+                    {% endblock rightcol %}
+                </tr>
+            </table>
+
+            {% block content %}{% endblock %}
+            {% block delete %}{% endblock %}
+
+        </div>
+
+        {% block body %}
+        {% endblock body %}
+
+        {% block footer %}
+            <div id="footer">
+                <hr>
+                <div class="row" style="margin-left: 0; margin-right: 0;">
+                    <div class="col-md-2">
+                        <a id="telemeta_powered" href="{% telemeta_url %}" target="_blank"><img
+                                src="{{ STATIC_URL }}telemeta/images/logo_mini_2.png"
+                                alt="Telemeta Powered"/></a>
+                        <span style="font-weight: bold;"><br/>&nbsp;v{% telemeta_version %}</span>
+                    </div>
+                    <div class="col-md-8" style="margin-top: 8px;">
+                        <center>
+                            {% trans "Usage of the archives in the respect of cultural heritage of the original communities." %}
+                        </center>
+                    </div>
+                    <div class="col-md-2" style="text-align: right;">
+                        Copyright &copy; {% current_year %} {% organization %}<br>
+                        <a href="{% url "telemeta-flatpage" "legal_notices" %}">{% trans "Legal notices" %}</a>
+                    </div>
+                </div>
+            </div>
+        {% endblock %}
     </div>
-</form>
-</div>
-{% endblock search %}
-
-<div id="menu">
-{% block menu %}
-
-{# spaces between li and a elements breaks layout #}
-
-<ul id="nav">
- {% if user.is_authenticated %}
-  <li><a href="{% url "telemeta-desk-lists" %}" class="blue">{% trans "Desk" %}</a></li>
- {% else %}
-  <li><a href="{% url "telemeta-home" %}" class="blue">{% trans "Home" %}</a></li>
- {% endif %}
-
- <li><a href="#archives#" class="green">{% trans "Archives" %}</a>
-  <ul>
-    <li><a href="{% url "telemeta-resource-list" "fonds" %}">{% trans "Fonds" %}</a></li>
-    <li><a href="{% url "telemeta-resource-list" "corpus" %}">{% trans "Corpus" %}</a></li>
-    <li><a href="{% url "telemeta-collections" %}">{% trans "Collections" %}</a></li>
-    <li><a href="{% url "telemeta-items" %}">{% trans "Items" %}</a></li>
-  </ul>
- </li>
-
- <li><a href="{% url "telemeta-geo-continents" %}" class="yellow">{% trans "Geo Navigator" %}</a></li>
-
- <li><a href="{% url "haystack_advance_search" %}" class="orange">{% trans "Advanced search" %}</a></li>
- {% if user.is_authenticated %}
-  {% if user.is_staff or not perms.telemeta.can_not_view_users_and_profiles %}
-  <li><a href="{% url "telemeta-users" %}" class="red">{% trans "Users" %}</a></li>
-  {% endif %}
- {% endif %}
- {% if user.is_staff %}
- <li><a href="#admin#" class="violet">{% trans "Admin" %}</a>
- <ul>
- <li><a href="{% url "telemeta-home" %}admin/django/" target="_blank">{% trans "General" context "admin" %}</a></li>
- <li><a href="{% url "telemeta-admin-enumerations" %}">{% trans "Enumerations" %}</a></li>
- <li><a href="{% url "telemeta-instrument-edit" %}">{% trans "Instruments" %}</a></li>
- <li><a href="{% url "telemeta-instrument-alias-edit" %}">{% trans "Instrument aliases" %}</a></li>
- </ul>
- </li>
-{% endif %}
-</ul>
-<form id="formlang" action="/i18n/setlang/" method="post" style="display:inline-block;">
-
-    {% csrf_token %}
-
-    <input name="next" type="hidden" value="{% url 'telemeta-home' %}" />
-
-    <select name="language" style="color:#6a0307">
-
-    {% for lang in LANGUAGES %}
-
-        <option value="{{ lang.0 }}">{{ lang.1 }}</option>
-
-    {% endfor %}
-
-    </select>
-
-
-    <input type="submit" value="Ok" />
-
-</form>
-
-
-{% endblock menu %}
-</div>
-</div>
-{% endblock header %}
-
-{% block postman_menu %}
-{% endblock postman_menu %}
-
-{% if breadcrumbs %}
-<ul class="breadcrumbs">
-  <li><a href="#">Home</a></li>
-  <li><a href="#">Features</a></li>
-  <li class="unavailable"><a href="#">Gene Splicing</a></li>
-  <li class="current"><a href="#">Cloning</a></li>
-</ul>
-{% endif %}
-
-<div id="content">
-    <table id="content_header"><tr>
-            <td class="leftcol"><h1>{% block title %}{% endblock %}</h1></td>
-            {% block rightcol %}
-            <td class="rightcol" {% if LANGUAGE_BIDI %}style="float : left;"{% else %}style="float : right;"{% endif %}>{% block title_buttons %}{% endblock %}</td>
-            {% endblock rightcol %}
-    </tr></table>
-
-  {% block content %}{% endblock %}
-  {% block delete %}{% endblock %}
-
-</div>
-
-{% block body %}
-{% endblock body %}
-
-{% block footer %}
-<div id="footer">
- <hr>
- <div class="row" style="margin-left: 0; margin-right: 0;">
-  <div class="col-md-2">
-    <a id="telemeta_powered" href="{% telemeta_url %}" target="_blank"><img src="{{ STATIC_URL }}telemeta/images/logo_mini_2.png"
-   alt="Telemeta Powered"/></a>
-   <span style="font-weight: bold;"><br />&nbsp;v{% telemeta_version %}</span>
-  </div>
-  <div class="col-md-8" style="margin-top: 8px;">
-    <center>
-    {% trans "Usage of the archives in the respect of cultural heritage of the original communities." %}
-    </center>
-  </div>
-  <div class="col-md-2" style="text-align: right;">
-    Copyright &copy; {% current_year %} {% organization %}<br>
-    <a href="{% url "telemeta-flatpage" "legal_notices" %}">{% trans "Legal notices" %}</a>
-  </div>
- </div>
-</div>
-{% endblock %}
-</div>
 {% endblock layout %}
 
 </body>
index 1684a29a7b27697cbf1cfd149e60583795ce8633..9d9c3bac7ca67f0589a13e495f63670b8ed2bd57 100644 (file)
@@ -61,7 +61,7 @@
     //playlists:
     {% if user.is_authenticated %}
         {% for playlist in playlists %}
-               {% if forloop.counter0 in rang_item_playliste %}
+               {% if forloop.counter0 in rang_item_playlist %}
                            playlistUtils.addPlaylist('{{ playlist.playlist.title }}'+ gettrans('(playlisted)'),'{{playlist.playlist.public_id}}');
                {% else %}
                            playlistUtils.addPlaylist('{{ playlist.playlist.title }}','{{playlist.playlist.public_id}}');
index 46d44890509ee34d20a98bd1f668b891a0925e0c..6a11ed0fa792cb510441c8ff461eb50782515906 100644 (file)
             <li><a href="
 
 
+
+
                     {% block url_unpublished %}{% url "telemeta-items-unpublished" %}{% endblock %}">{% trans "Unpublished" %}</a>
             </li>
             <li><a href="
 
 
+
+
                     {% block url_published %}{% url "telemeta-items-published" %}{% endblock %}">{% trans "Published" %}</a>
             </li>
             <li><a href="
 
 
+
+
                     {% block url_sound %}{% url "telemeta-items-sound" %}{% endblock %}">{% trans "Digitized" context "item list" %}</a>
             </li>
         </ul>
index 3b01fc36d5b919ce12082cb306ed5ca4546e69dc..6e4205e0fc00d1639d060f304424f13dc0ad2577 100644 (file)
@@ -131,7 +131,7 @@ urlpatterns = patterns('',
     url(r'^search/quick/(?P<type>[A-Za-z0-9._-]+)/$', HaystackSearch(), name='haystack_search_type'),
     url(r'^search/advance/$', HaystackAdvanceSearch(form_class=HayAdvanceForm, template='search/advanceSearch.html'), name='haystack_advance_search'),
     url(r'^search/advance/(?P<type>[A-Za-z0-9._-]+)/$', HaystackAdvanceSearch(form_class=HayAdvanceForm, template='search/advanceSearch.html'), name='haystack_advance_search_type'),
-    url(r'^search/booleaninstru/$', boolean_view.getBooleanQuery),
+    url(r'^search/booleaninstru/$', boolean_view.get_boolean_query),
 
     url(r'^search/playlist_add/(?P<type>[A-Za-z0-9._-]+)/$', NewPlaylistView().display, name='haystack_playlist'),
     url(r'^search/playlist_confirmation/(?P<type>[A-Za-z0-9._-]+)/$',NewPlaylistView().addToPlaylist, name='add_confirmation'),
index c9654e02bf3221b91e10a2f94db91cf1d444e92e..6bf32793c402ebd476a6180861e5f3979e1ff662 100644 (file)
@@ -4,7 +4,10 @@ from telemeta.models import *
 from telemeta.search_indexes import *
 from django.db.models import Q
 
-
+#Custom realtime signal in order to update the "autcomplete" index
+#when add/remove instruments/locations in items.
+#Differences of values of fields are checked by the tracker
+#of django-dirtyfields' module
 class RealTimeCustomSignal(signals.RealtimeSignalProcessor):
     handleFields = ('location', 'instrument', 'alias')
     handleModels = (MediaItem, MediaItemPerformance, )
index 85c8734464daae04d18d0df622988921c7327b02..ba0d1821bbbc855fe9663866f27106d7b26d6198 100644 (file)
@@ -827,7 +827,7 @@ class ItemDetailView(ItemViewMixin, DetailView):
         context['format'] = item_format
         context['private_extra_types'] = private_extra_types.values()
         context['site'] = 'http://' + Site.objects.all()[0].name
-        context['rang_item_playliste']=rang
+        context['rang_item_playlist']=rang
         # if ts_item:
         #     context['ts_item_id'] = ts_item.pk
         # else:
index b1e553eb0661a3e22f95e0574f8e9c3fd3ad6921..3fd5f495b4b2fd8518dc4325dbe6c470b7c9b766 100644 (file)
@@ -27,6 +27,8 @@ from django.http import HttpResponse
 from telemeta.forms.boolean_form import *
 from django.forms.formsets import formset_factory
 import re
+import unicodedata
+
 
 
 class HaystackSearch(FacetedSearchView, SavedSearchView):
@@ -179,7 +181,7 @@ def autocomplete(request):
         suggestions = []
         for chaine in collecteurs:
             for word in chaine.split('; '):
-                if word != "" and escapeAccentAndLower(request.GET.get('q', '')) in escapeAccentAndLower(word):
+                if word != "" and escape_accent_and_lower(request.GET.get('q', '')) in escape_accent_and_lower(word):
                     suggestions.append(word)
     elif attribut == "location" or attribut == "instruments":
         sqs = SearchQuerySet().using('autocomplete')
@@ -204,18 +206,14 @@ def autocomplete(request):
     })
     return HttpResponse(the_data, content_type='application/json')
 
-
-import unicodedata
-
-
-def escapeAccentAndLower(chaine):
+def escape_accent_and_lower(chaine):
     return unicodedata.normalize('NFD', chaine).encode('ascii', 'ignore').lower()
 
 
 class BooleanSearchView(object):
     form = formset_factory(BooleanSearch)
 
-    def getBooleanQuery(self, request):
+    def get_boolean_query(self, request):
         if request.method != 'GET':
             return HttpResponse(json.dumps({'result': '[ERROR]:Not Request GET'}), content_type='application/json')
 
@@ -226,9 +224,9 @@ class BooleanSearchView(object):
                 formul = formset.forms[i]
                 if i != 0:
                     query += formul.cleaned_data["boolean"] + " "
-                query += formul.cleaned_data["startBracket"]
-                query += formul.cleaned_data["textField"].strip() + " "
-                query += formul.cleaned_data["endBracket"]
+                query += formul.cleaned_data["start_bracket"]
+                query += formul.cleaned_data["text_field"].strip() + " "
+                query += formul.cleaned_data["end_bracket"]
             try:
                 self.is_correct_query(query.strip())
             except Erreur as e:
@@ -238,15 +236,15 @@ class BooleanSearchView(object):
             return HttpResponse(json.dumps({'result': '[ERROR]Field(s) missing'}), content_type='application/json')
 
     def is_correct_query(self, query):
-        tabQuery = query.split()
-        openBracket = 0
+        tab_query = query.split()
+        open_bracket = 0
         boolean = False
-        for mot in tabQuery:
+        for mot in tab_query:
             if mot == ")":  #
-                if openBracket == 0:
+                if open_bracket == 0:
                     raise Erreur("[ERROR]Open Bracket Is Missing !")
                 else:
-                    openBracket -= 1
+                    open_bracket -= 1
                     boolean = False
             elif mot == "ET" or mot == "OU":
                 if boolean:
@@ -254,12 +252,12 @@ class BooleanSearchView(object):
                 else:
                     boolean = True
             elif mot == "(":
-                openBracket += 1
+                open_bracket += 1
             else:
                 boolean = False
         if boolean:
             raise Erreur("[ERROR]Boolean at the end of query")
-        elif openBracket != 0:
+        elif open_bracket != 0:
             raise Erreur("[ERROR]Close Bracket Is Missing")
         else:
             return True