cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

permission working

Browse source
This commit is contained in:
Qwann 2017-03-10 16:40:36 +01:00
parent f18bb9f336
commit cd31c55254
4 changed files with 38 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kfet/decorators.py
View file

@ -9,4 +9,8 @@ from django_cas_ng.decorators import user_passes_test
def kfet_is_team(user): def kfet_is_team(user):
return user.has_perm('kfet.is_team') return user.has_perm('kfet.is_team')
def can_force_close(user):
return user.has_perm('force_close_kfet')
teamkfet_required = user_passes_test(lambda u: kfet_is_team(u)) teamkfet_required = user_passes_test(lambda u: kfet_is_team(u))
force_close_required = user_passes_test(lambda u: can_force_close(u))

2
kfet/models.py
View file

@ -594,7 +594,7 @@ class GlobalPermissions(models.Model):
('edit_balance_account', "Modifier la balance d'un compte"), ('edit_balance_account', "Modifier la balance d'un compte"),
('change_account_password', "Modifier le mot de passe d'une personne de l'équipe"), ('change_account_password', "Modifier le mot de passe d'une personne de l'équipe"),
('special_add_account', "Créer un compte avec une balance initiale"), ('special_add_account', "Créer un compte avec une balance initiale"),
('can_close_kfet', "Peut fermer manuelement la K-Fêt"), ('force_close_kfet', "Fermer manuelement la K-Fêt"),
) )

38
kfet/static/kfet/js/kfet_open.js
View file

@ -17,13 +17,7 @@ function kfet_open(init_date, init_satus, init_force_close, force_close_url, for
var force_close = init_force_close; var force_close = init_force_close;
// EVENT // EVENT
force_close_button.click(function() { force_close_button.click(forceClose);
if (force_close) {
$.get(force_open_url, function(data) {});
} else {
$.get(force_close_url, function(data) {});
}
});
// INITIALISAITION // INITIALISAITION
update_open(); update_open();
@ -36,6 +30,36 @@ function kfet_open(init_date, init_satus, init_force_close, force_close_url, for
}, 30 * 1000); // 60 * 1000 milsec }, 30 * 1000); // 60 * 1000 milsec
// FONCTIONS // FONCTIONS
function forceClose(password = '') {
if (force_close) {
force_url = force_open_url;
} else {
force_url = force_close_url;
}
$.ajax({
dataType: "html",
url : force_url,
method : "GET",
beforeSend: function ($xhr) {
if (password != '')
$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;
});
}
function nb_min_diff() { function nb_min_diff() {
var date_now = new Date(); var date_now = new Date();
// On calcule le nb de minutes depuis le dernier // On calcule le nb de minutes depuis le dernier

3
kfet/views.py
View file

@ -22,7 +22,7 @@ from django.utils import timezone
from django.utils.crypto import get_random_string from django.utils.crypto import get_random_string
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from gestioncof.models import CofProfile, Clipper from gestioncof.models import CofProfile, Clipper
from kfet.decorators import teamkfet_required from kfet.decorators import teamkfet_required, force_close_required
from kfet.models import ( from kfet.models import (
Account, Checkout, Article, Settings, AccountNegative, Account, Checkout, Article, Settings, AccountNegative,
CheckoutStatement, GenericTeamToken, Supplier, SupplierArticle, Inventory, CheckoutStatement, GenericTeamToken, Supplier, SupplierArticle, Inventory,
@ -126,6 +126,7 @@ class UpdateForceClose(View):
@method_decorator(login_required) @method_decorator(login_required)
@method_decorator(teamkfet_required) @method_decorator(teamkfet_required)
@method_decorator(force_close_required)
def dispatch(self, *args, **kwargs): def dispatch(self, *args, **kwargs):
return super(UpdateForceClose, self).dispatch(*args, **kwargs) return super(UpdateForceClose, self).dispatch(*args, **kwargs)