Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/search_icon
This commit is contained in:
commit
7485308436
|
@ -48,11 +48,11 @@
|
|||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-3"><b>F2</b></div>
|
||||
<div class="col-xs-9">Reset compte</div>
|
||||
<div class="col-xs-9">Reset panier</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-3"><b>Shift + F2</b></div>
|
||||
<div class="col-xs-9">Reset panier</div>
|
||||
<div class="col-xs-9">Reset compte</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-3"><b>F9</b></div>
|
||||
|
@ -245,12 +245,14 @@ $(document).ready(function() {
|
|||
if (account_data['id'] != 0) {
|
||||
var url_base = '{% url 'kfet.account.read' 'LIQ' %}';
|
||||
url_base = url_base.substr(0, url_base.length - 3);
|
||||
buttons += '<a href="'+ url_base + account_data['trigramme']+'" class="btn btn-primary" target="_blank" title="Modifier"><span class="glyphicon glyphicon-cog"></span></a>';
|
||||
trigramme = encodeURIComponent(account_data['trigramme']) ;
|
||||
buttons += '<a href="'+ url_base + trigramme +'" class="btn btn-primary" target="_blank" title="Modifier"><span class="glyphicon glyphicon-cog"></span></a>';
|
||||
}
|
||||
if (account_data['id'] == 0) {
|
||||
var trigramme = triInput.val().toUpperCase();
|
||||
if (isValidTrigramme(trigramme)) {
|
||||
var url_base = '{% url 'kfet.account.create' %}'
|
||||
trigramme = encodeURIComponent(trigramme);
|
||||
buttons += '<a href="'+url_base+'?trigramme='+trigramme+'" class="btn btn-primary" target="_blank" title="Créer"><span class="glyphicon glyphicon-plus"></span></a>';
|
||||
} else {
|
||||
var url_base = '{% url 'kfet.account' %}'
|
||||
|
@ -1253,13 +1255,13 @@ $(document).ready(function() {
|
|||
return false;
|
||||
case 113:
|
||||
if (e.shiftKey) {
|
||||
// Shift+F2 - Basket reset
|
||||
resetBasket();
|
||||
articleSelect.focus();
|
||||
} else {
|
||||
// F2 - Account reset
|
||||
// Shift+F2 - Account reset
|
||||
resetAccount();
|
||||
triInput.focus();
|
||||
} else {
|
||||
// F2 - Basket reset
|
||||
resetBasket();
|
||||
articleSelect.focus();
|
||||
}
|
||||
return false;
|
||||
case 114:
|
||||
|
|
Loading…
Reference in a new issue