diff --git a/kfet/consumers.py b/kfet/consumers.py index 72e3b21e..8a0df05f 100644 --- a/kfet/consumers.py +++ b/kfet/consumers.py @@ -26,11 +26,6 @@ class KPsul(JsonWebsocketConsumer): pass class KfetOpen(JsonWebsocketConsumer): - - # Set to True if you want them, else leave out - strict_ordering = False - slight_ordering = False - def connection_groups(self, **kwargs): return ['kfet.is_open'] diff --git a/kfet/decorators.py b/kfet/decorators.py index 592bf566..3dc76767 100644 --- a/kfet/decorators.py +++ b/kfet/decorators.py @@ -9,6 +9,4 @@ def kfet_is_team(user): def can_force_close(user): return user.has_perm('force_close_kfet') -teamkfet_required = user_passes_test(lambda u: kfet_is_team(u)) -force_close_required = user_passes_test(lambda u: can_force_close(u)) teamkfet_required = user_passes_test(kfet_is_team) diff --git a/kfet/static/kfet/js/kfet_open.js b/kfet/static/kfet/js/kfet_open.js index 8ea0be70..e2cccf81 100644 --- a/kfet/static/kfet/js/kfet_open.js +++ b/kfet/static/kfet/js/kfet_open.js @@ -1,4 +1,4 @@ -function kfet_open(init_date, init_satus, init_force_close, force_close_url, force_open_url) { +function kfet_open(init_date, init_status, init_force_close, force_close_url, force_open_url) { // VARIABLES var kfet_open_bullet = $('#kfet-open'); var open_status = $('#open_status'); @@ -19,15 +19,15 @@ function kfet_open(init_date, init_satus, init_force_close, force_close_url, for // EVENT force_close_button.click(forceClose); - // INITIALISAITION + // INITIALISATION update_open(); update_force_button(); - // On recherge toute les 30sec - // (dans le cas où le statut deviendrait inconn) + // On recharge toute les 30sec + // (dans le cas où le statut deviendrait inconnu) setInterval(function() { update_open(); - }, 30 * 1000); // 60 * 1000 milsec + }, 30 * 1000); // 30 * 1000 milsec // FONCTIONS function forceClose(password = '') { @@ -45,16 +45,12 @@ function kfet_open(init_date, init_satus, init_force_close, force_close_url, for $xhr.setRequestHeader("KFetPassword", password); }, }) - .done(function() {}) .fail(function($xhr) { var data = $xhr.responseJSON; switch ($xhr.status) { case 403: requestAuth({'errors':{}}, forceClose); break; - case 400: - alert('lol'); - break; } lock = 0; }); @@ -89,7 +85,7 @@ function kfet_open(init_date, init_satus, init_force_close, force_close_url, for open_status.html("?????"); } function update_open() { - nb_min = nb_min_diff(); + var nb_min = nb_min_diff(); console.log("K-Fêt ouverte : " + (kfet_open&&(!force_close))); console.log(nb_min + " minute(s) depuis la dernière mise à jour"); if (force_close) { diff --git a/kfet/urls.py b/kfet/urls.py index 718eac40..7b47d8c9 100644 --- a/kfet/urls.py +++ b/kfet/urls.py @@ -205,8 +205,9 @@ urlpatterns = [ url('^kfet_open/$', views.UpdateKfetOpen.as_view(), name='kfet.kfet_open'), - url('^force_close/$', - views.UpdateForceClose.as_view(), + url('^kfet_close/$', + permission_required('kfet.can_force_close') + (views.UpdateForceClose.as_view()), name='kfet.force_close'), # ----- diff --git a/kfet/views.py b/kfet/views.py index 51948de1..7865ec34 100644 --- a/kfet/views.py +++ b/kfet/views.py @@ -7,9 +7,8 @@ from django.shortcuts import render, get_object_or_404, redirect from django.core.exceptions import PermissionDenied from django.core.cache import cache from django.views.generic import ListView, DetailView, TemplateView, View -from django.views.generic.list import BaseListView, MultipleObjectTemplateResponseMixin -from django.views.generic.detail import BaseDetailView, SingleObjectTemplateResponseMixin -from django.views.generic.edit import CreateView, UpdateView, DeleteView, FormView +from django.views.generic.detail import BaseDetailView +from django.views.generic.edit import CreateView, UpdateView from django.core.urlresolvers import reverse, reverse_lazy from django.contrib import messages from django.contrib.messages.views import SuccessMessageMixin @@ -25,7 +24,7 @@ from django.utils import timezone from django.utils.crypto import get_random_string from django.utils.decorators import method_decorator from gestioncof.models import CofProfile -from kfet.decorators import teamkfet_required, force_close_required +from kfet.decorators import teamkfet_required from kfet.models import ( Account, Checkout, Article, Settings, AccountNegative, CheckoutStatement, GenericTeamToken, Supplier, SupplierArticle, Inventory, @@ -125,12 +124,6 @@ class UpdateForceClose(View): return HttpResponse("closed : %r at %s" % (force_close_get, time.isoformat())) - @method_decorator(login_required) - @method_decorator(teamkfet_required) - @method_decorator(force_close_required) - def dispatch(self, *args, **kwargs): - return super(UpdateForceClose, self).dispatch(*args, **kwargs) - @teamkfet_required def login_genericteam(request):