"BUGFIX: Un staffer ne peut pas selectionner plusieurs créneaux du même tour"

This commit is contained in:
Doug Le Tough 2018-03-10 00:13:54 +01:00
parent fe10a9320e
commit d7ed7007e4
3 changed files with 20 additions and 18 deletions

View File

@ -546,22 +546,24 @@ def save_staff_slot(turn_id, slot_id, user_id):
""" Save staff given slot """
slot = Tetawebapp_staffs.query.filter(Tetawebapp_staffs.turn_id==turn_id, Tetawebapp_staffs.slot_num==slot_id).count()
if slot == 0:
slot = Tetawebapp_staffs(user_id=user_id,
turn_id=turn_id,
slot_num=slot_id)
try:
db.session.add(slot)
commit = db.session.commit()
except Exception as e:
db.session.rollback()
print "[+] Error at save_staff_slot:"
print "------------------------------"
print "%s" % e.message
print "------------------------------"
return False
if commit != None:
return False
return True
slot = Tetawebapp_staffs.query.filter(Tetawebapp_staffs.turn_id==turn_id, Tetawebapp_staffs.user_id==user_id).count()
if slot == 0:
slot = Tetawebapp_staffs(user_id=user_id,
turn_id=turn_id,
slot_num=slot_id)
try:
db.session.add(slot)
commit = db.session.commit()
except Exception as e:
db.session.rollback()
print "[+] Error at save_staff_slot:"
print "------------------------------"
print "%s" % e.message
print "------------------------------"
return False
if commit != None:
return False
return True
return False
########################################################################

View File

@ -62,7 +62,7 @@ function save_turn() {
function update_sheet(obj, turn, slot) {
var url = '/staffsheet/update/'+turn+'/'+slot;
get_html_from_ajax(obj, url);
get_html_from_ajax(obj, url)
obj.onclick=function (){ return clear_sheet(obj, turn, slot);}
return true;
}

View File

@ -131,7 +131,7 @@ function get_html_from_ajax(obj, url) {
xhttp.onload = function(){
if (xhttp.status != 200) {
obj.innerHTML = "Error while getting content (2)";
}
}
};
xhttp.onreadystatechange = function() {