DGNum/gestioCOF
15
2
Fork 2
Code Issues 79 Pull requests 21 Projects Releases 12 Packages Wiki Activity

Fix url pour production

Browse source
This commit is contained in:
Aurélien Delobelle 2016-09-05 19:50:16 +02:00
parent db4ae73dfd
commit 3d2583e2a0
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kfet/static/kfet/js/kfet.js
View file

@ -66,8 +66,10 @@ function getErrorsHtml(data) {
content += '</ul>'; content += '</ul>';
} }
if ('negative' in data['errors']) { if ('negative' in data['errors']) {
var url_base = "{% url 'kfet.account.update' LIQ}";
url_base = base_url(0, url_base.length-8);
for (var i=0; i<data['errors']['negative'].length; i++) { for (var i=0; i<data['errors']['negative'].length; i++) {
content += '<a class="btn btn-primary" href="/k-fet/accounts/'+data['errors']['negative'][i]+'/edit" target="_blank" style="width:100%">Autorisation de négatif requise pour '+data['errors']['negative'][i]+'</a>'; content += '<a class="btn btn-primary" href="'+url_base+data['errors']['negative'][i]+'/edit" target="_blank" style="width:100%">Autorisation de négatif requise pour '+data['errors']['negative'][i]+'</a>';
} }
} }
if ('addcost' in data['errors']) { if ('addcost' in data['errors']) {

4
kfet/templates/kfet/history.html
View file

@ -213,8 +213,10 @@ $(document).ready(function() {
content += '</ul>'; content += '</ul>';
} }
if ('negative' in data['errors']) { if ('negative' in data['errors']) {
var url_base = "{% url 'kfet.account.update' LIQ}";
url_base = base_url(0, url_base.length-8);
for (var i=0; i<data['errors']['negative'].length; i++) { for (var i=0; i<data['errors']['negative'].length; i++) {
content += '<a class="btn btn-primary" href="/k-fet/accounts/'+data['errors']['negative'][i]+'/edit" target="_blank">Autorisation de négatif requise pour '+data['errors']['negative'][i]+'</a>'; content += '<a class="btn btn-primary" href="'+url_base+data['errors']['negative'][i]+'/edit" target="_blank">Autorisation de négatif requise pour '+data['errors']['negative'][i]+'</a>';
} }
} }
return content; return content;

6
kfet/templates/kfet/kpsul.html
View file

@ -302,8 +302,10 @@ $(document).ready(function() {
$('#checkout-last_statement_at').text(at_formated); $('#checkout-last_statement_at').text(at_formated);
var buttons = ''; var buttons = '';
if (checkout_data['id'] !== 0) { if (checkout_data['id'] !== 0) {
buttons += '<a class="btn btn-primary" href="/k-fet/checkouts/'+checkout_data['id']+'/statements/add" title="Effectuer un relevé" target="_blank"><span class="glyphicon glyphicon-euro"></span></a>'; var url_base = "{% url 'kfet.checkoutstatement.create' 1 %}";
buttons += '<a class="btn btn-primary" href="/k-fet/checkouts/'+checkout_data['id']+'" title="Modifier" target="_blank"><span class="glyphicon glyphicon-cog"></span></a>'; url_base = url_base.substr(0,url_base.length - 16);
buttons += '<a class="btn btn-primary" href="'+url_base+checkout_data['id']+'/statements/add" title="Effectuer un relevé" target="_blank"><span class="glyphicon glyphicon-euro"></span></a>';
buttons += '<a class="btn btn-primary" href="'+url_base+checkout_data['id']+'" title="Modifier" target="_blank"><span class="glyphicon glyphicon-cog"></span></a>';
} }
checkout_container.find('.buttons').html(buttons); checkout_container.find('.buttons').html(buttons);
} }