carom/carom-server
6
1
Fork 0
Code Issues Pull Requests Releases 2 Activity

rewrite url scemata

Browse Source
This commit is contained in:
Robert Einsle
2017-04-27 14:22:23 +02:00
parent b345c9dfaf
commit 279d643758
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
billard/templates/billard/accountmodal.html
View File

@@ -22,7 +22,7 @@
</table>
</div>
<div class="modal-footer">
<a class="btn btn-default btn-primary" href="{% url 'billard:account_modal_confirm' pk=account.id %}">Schliessen</a>
<a class="btn btn-default btn-primary" href="{% url 'billard:account_modal_confirm' pk=account.id loc_pk=loc_pk %}">Schliessen</a>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->

2
billard/templates/billard/location_detail.html
View File

@@ -20,7 +20,7 @@ $(document).ready(function() {
function refresh_page() {
$('#desk_data').load('#');
$('#modal-wrapper').load('{% url 'billard:account_modal' %}', function() {
$('#modal-wrapper').load('{% url 'billard:account_modal' loc_pk=pk %}', function() {
if ( $('#accountsmodal').length ) {
window.clearInterval(interval);
$('#accountsmodal').modal('show');

5
billard/urls.py
View File

@@ -17,9 +17,10 @@ urlpatterns = [
# ex. /billard/1/accounting/confirm
url(r'^(?P<pk>[0-9]+)/accounting/confirm/$', views.accounting_confirm, name='accounting_detail_confirm'),
# ex. /billard/1/account_modal/
url(r'^account_modal/$', views.account_modal_view, name='account_modal'),
url(r'^(?P<loc_pk>[0-9]+)/account_modal/$', views.account_modal_view, name='account_modal'),
# ex. /billard/1/account_modal/confirm/
url(r'^account_modal/(?P<pk>[0-9]+)/confirm/$', views.account_modal_confirm_view, name='account_modal_confirm'),
url(r'^(?P<loc_pk>[0-9]+)/account_modal/(?P<pk>[0-9]+)/confirm/$', views.account_modal_confirm_view,
name='account_modal_confirm'),
# ex. /billard/api/v1/ (rest api)
url(r'api/v1/', include(router.urls)),
# ex. /billard/process_location_data/

13
billard/views.py
View File

@@ -31,7 +31,9 @@ class LocationDetailView(generic.DetailView):
'location': self.get_object(),
}
return render(request, template_name='billard/location_detail_ajax.html', context=context)
return super(LocationDetailView, self).dispatch(request, *args, **kwargs)
result = super(LocationDetailView, self).dispatch(request, *args, **kwargs)
result.context_data['pk'] = self.kwargs['pk']
return result
@method_decorator(login_required, name='dispatch')
@@ -67,7 +69,7 @@ def accounting_confirm(request, pk):
@login_required
def account_modal_view(request):
def account_modal_view(request, loc_pk):
try:
uuids = Client.objects.filter(report_user=request.user).values_list('uuid')
account = Accounting.objects.filter(reporter_uuid__in=uuids).first
@@ -75,17 +77,18 @@ def account_modal_view(request):
except Client.DoesNotExist:
account = None
context = {
'account': account
'account': account,
'loc_pk': loc_pk,
}
return render(request, 'billard/accountmodal.html', context=context)
@login_required
def account_modal_confirm_view(request, pk):
def account_modal_confirm_view(request, loc_pk, pk):
account = Accounting.objects.get(pk=pk)
account.reporter_uuid = None
account.save()
return redirect('billard:location_detail', pk=account.desk.client.location_id)
return redirect('billard:location_detail', pk=loc_pk)
class LocationDataViewSet(viewsets.ModelViewSet):