Message

kfet/forms.py

@@ -28,12 +28,12 @@ class DateTimeWidget(forms.DateTimeInput):
         self.attrs['format'] = '%Y-%m-%d %H:%M'
     class Media:
         css = {
-                'all': ('bootstrap-datetimepicker.min.css',)
+                'all': ('kfet/css/bootstrap-datetimepicker.min.css',)
             }
         js  = (
-                'moment.js',
+                'kfet/js/moment.js',
-                'moment-fr.js',
+                'kfet/js/moment-fr.js',
-                'bootstrap-datetimepicker.min.js',
+                'kfet/js/bootstrap-datetimepicker.min.js',
             )
 # -----
 # Account forms

kfet/middleware.py

@@ -6,6 +6,7 @@ from builtins import *
 
 from django.http import HttpResponseForbidden
 from kfet.backends import KFetBackend
+from kfet.models import Account
 
 class KFetAuthenticationMiddleware(object):
     def process_request(self, request):
@@ -14,8 +15,3 @@ class KFetAuthenticationMiddleware(object):
         if temp_request_user:
             request.real_user = request.user
             request.user = temp_request_user
-        if request.user.has_perm('kfet.is_team'):
-            try:
-                request.user.profile.account_kfet
-            except RelatedObjectDoesNotExist:
-                return HttpResponseForbidden

kfet/static/kfet/js/moment-fr.js

@@ -0,0 +1,64 @@
+//! moment.js locale configuration
+//! locale : French [fr]
+//! author : John Fischer : https://github.com/jfroffice
+
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var fr = moment.defineLocale('fr', {
+        months : 'Janvier_Février_Mars_Avril_Mai_Juin_Juillet_Août_Septembre_Octobre_Novembre_Décembre'.split('_'),
+        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'Dimanche_Lundi_Mardi_Mercredi_Jeudi_Vendredi_Samedi'.split('_'),
+        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+        weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[Aujourd\'hui à] LT',
+            nextDay: '[Demain à] LT',
+            nextWeek: 'dddd [à] LT',
+            lastDay: '[Hier à] LT',
+            lastWeek: 'dddd [dernier à] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'dans %s',
+            past : 'il y a %s',
+            s : 'quelques secondes',
+            m : 'une minute',
+            mm : '%d minutes',
+            h : 'une heure',
+            hh : '%d heures',
+            d : 'un jour',
+            dd : '%d jours',
+            M : 'un mois',
+            MM : '%d mois',
+            y : 'un an',
+            yy : '%d ans'
+        },
+        ordinalParse: /\d{1,2}(er|)/,
+        ordinal : function (number) {
+            return number + (number === 1 ? 'er' : '');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return fr;
+
+}));

kfet/templates/kfet/account_read.html

@@ -5,9 +5,9 @@
 
 {% block extra_head %}
 <script type="text/javascript" src="{% static 'kfet/js/js.cookie.js' %}"></script>
-<script type="text/javascript" src="{% static 'moment.js' %}"></script>
+<script type="text/javascript" src="{% static 'kfet/js/moment.js' %}"></script>
-<script type="text/javascript" src="{% static 'moment-fr.js' %}"></script>
+<script type="text/javascript" src="{% static 'kfet/js/moment-fr.js' %}"></script>
-<script type="text/javascript" src="{% static 'moment-timezone-with-data-2010-2020.js' %}"></script>
+<script type="text/javascript" src="{% static 'kfet/js/moment-timezone-with-data-2010-2020.js' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/kfet.js' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/history.js' %}"></script>
 {% endblock %}

kfet/templates/kfet/history.html

@@ -4,15 +4,15 @@
 
 {% block extra_head %}
 <link rel="stylesheet" type="text/css" href="{% static 'kfet/css/jquery-ui.min.css' %}">
-<link rel="stylesheet" type="text/css" href="{% static 'bootstrap-datetimepicker.min.css' %}">
+<link rel="stylesheet" type="text/css" href="{% static 'kfet/css/bootstrap-datetimepicker.min.css' %}">
 <link rel="stylesheet" type="text/css" href="{% static 'kfet/css/multiple-select.css' %}">
 <script type="text/javascript" src="{% static 'kfet/js/js.cookie.js' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/jquery-ui.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/jquery-confirm.js' %}"></script>
-<script type="text/javascript" src="{% static 'moment.js' %}"></script>
+<script type="text/javascript" src="{% static 'kfet/js/moment.js' %}"></script>
-<script type="text/javascript" src="{% static 'moment-fr.js' %}"></script>
+<script type="text/javascript" src="{% static 'kfet/js/moment-fr.js' %}"></script>
-<script type="text/javascript" src="{% static 'moment-timezone-with-data-2010-2020.js' %}"></script>
+<script type="text/javascript" src="{% static 'kfet/js/moment-timezone-with-data-2010-2020.js' %}"></script>
-<script type="text/javascript" src="{% static 'bootstrap-datetimepicker.min.js' %}"></script>
+<script type="text/javascript" src="{% static 'kfet/js/bootstrap-datetimepicker.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/multiple-select.js' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/kfet.js' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/history.js' %}"></script>

kfet/templates/kfet/kpsul.html

@@ -8,9 +8,9 @@
 <script type="text/javascript" src="{% static 'kfet/js/reconnecting-websocket.js' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/jquery-ui.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/jquery-confirm.js' %}"></script>
-<script type="text/javascript" src="{% static 'moment.js' %}"></script>
+<script type="text/javascript" src="{% static 'kfet/js/moment.js' %}"></script>
-<script type="text/javascript" src="{% static 'moment-fr.js' %}"></script>
+<script type="text/javascript" src="{% static 'kfet/js/moment-fr.js' %}"></script>
-<script type="text/javascript" src="{% static 'moment-timezone-with-data-2010-2020.js' %}"></script>
+<script type="text/javascript" src="{% static 'kfet/js/moment-timezone-with-data-2010-2020.js' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/kfet.js' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/history.js' %}"></script>
 {% endblock %}
@@ -613,7 +613,7 @@ $(document).ready(function() {
         return false;
     }
 
-    articleSelect.on('keydown', function(e) {
+    articleSelect.on('keypress', function(e) {
         var text = articleSelect.val();
         // Comportement normal pour ces touches
         if (normalKeys.test(e.keyCode) || e.ctrlKey) {
@@ -655,7 +655,6 @@ $(document).ready(function() {
             return true;
         }
         var nb = articleNb.val()+e.key;
-        print(nb);
         if (is_nb_ok(nb))
             return true;
         return false;