Merge branch 'master' into 'Aufinal/merge_k-fet'

# Conflicts:
#   kfet/static/kfet/css/index.css

gestioncof/autocomplete.py

@@ -56,22 +56,24 @@ def autocomplete(request):
     # Fetching data from the SPI
     if hasattr(settings, 'LDAP_SERVER_URL'):
         # Fetching
-        ldap_query = '(|{:s})'.format(''.join(
-            ['(cn=*{bit:s}*)(uid=*{bit:s}*)'.format(**{"bit": bit})
-             for bit in bits]
+        ldap_query = '(&{:s})'.format(''.join(
+            '(|(cn=*{bit:s}*)(uid=*{bit:s}*))'.format(bit=bit)
+            for bit in bits if bit.isalnum()
         ))
-        with Connection(settings.LDAP_SERVER_URL) as conn:
-            conn.search(
-                'dc=spi,dc=ens,dc=fr', ldap_query,
-                attributes=['uid', 'cn']
-            )
-            queries['clippers'] = conn.entries
-        # Clearing redundancies
-        queries['clippers'] = [
-            Clipper(clipper.uid, clipper.cn)
-            for clipper in queries['clippers']
-            if str(clipper.uid) not in usernames
-        ]
+        if ldap_query != "(&)":
+            # If none of the bits were legal, we do not perform the query
+            with Connection(settings.LDAP_SERVER_URL) as conn:
+                conn.search(
+                    'dc=spi,dc=ens,dc=fr', ldap_query,
+                    attributes=['uid', 'cn']
+                )
+                queries['clippers'] = conn.entries
+            # Clearing redundancies
+            queries['clippers'] = [
+                Clipper(clipper.uid, clipper.cn)
+                for clipper in queries['clippers']
+                if str(clipper.uid) not in usernames
+            ]
 
     # Resulting data
     data.update(queries)

gestioncof/decorators.py

@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-from django_cas_ng.decorators import user_passes_test
+from django.contrib.auth.decorators import user_passes_test
 
 
 def is_cof(user):
@@ -14,9 +10,7 @@ def is_cof(user):
     except:
         return False
 
-cof_required = user_passes_test(lambda u: is_cof(u))
-cof_required_customdenied = user_passes_test(lambda u: is_cof(u),
-                                             login_url="cof-denied")
+cof_required = user_passes_test(is_cof)
 
 
 def is_buro(user):
@@ -26,4 +20,4 @@ def is_buro(user):
     except:
         return False
 
-buro_required = user_passes_test(lambda u: is_buro(u))
+buro_required = user_passes_test(is_buro)

gestioncof/static/css/cof.css

@@ -800,7 +800,7 @@ input#search_autocomplete {
  height: 40px;
  padding: 10px 8px;
  margin: 0 auto;
- margin-top: 20px;
+ margin-top: 0px;
  display: block;
  color: #aaa;
 }
@@ -1119,3 +1119,10 @@ div.messages div.alert-success div.container {
 div.messages div.alert div.container a {
     color: inherit;
 }
+
+/* Help text */
+
+p.help-block {
+  margin: 5px auto;
+  width: 90%;
+}

gestioncof/templates/registration.html

@@ -9,7 +9,9 @@
 
 {% block realcontent %}
     <h2>Inscription d'un nouveau membre</h2>
-    <input type="text" name="q" id="search_autocomplete" spellcheck="false" />
+    <p class="help-block">Les mots contenant des caractères non alphanumériques seront ignorés</p>
+    <input type="text" name="q" id="search_autocomplete" spellcheck="false"
+           placeholder="Chercher un utilisateur par nom, prénom ou identifiant clipper" />
     <div id="form-placeholder"></div>
     <div class="yourlabs-autocomplete"></div>
     <script type="text/javascript">
@@ -20,7 +22,6 @@
                 minimumCharacters: 3,
                 id: 'search_autocomplete',
                 choiceSelector: 'li:has(a)',
-                placeholder: "Chercher un utilisateur par nom, prénom ou identifiant clipper",
                 box: $(".yourlabs-autocomplete"),
             });
             $('input#search_autocomplete').bind(

gestioncof/templatetags/utils.py

@@ -23,7 +23,7 @@ def key(d, key_name):
 
 
 def highlight_text(text, q):
-    q2 = "|".join(q.split())
+    q2 = "|".join(re.escape(word) for word in q.split())
     pattern = re.compile(r"(?P<filter>%s)" % q2, re.IGNORECASE)
     return mark_safe(re.sub(pattern,
                             r"<span class='highlight'>\g<filter></span>",