arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-20 15:02:31 +00:00
Code Issues Projects Releases Wiki Activity

Updates to AJAX forms and adding autofill function to the event form when adding things via AJAX

Browse Source
This commit is contained in:
Tom Price
2014-12-03 11:17:07 +00:00
parent 6b760ba523
commit 0ad35dc6cc
7 changed files with 81 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
RIGS/templates/RIGS/event_form.html
View File

@@ -34,7 +34,6 @@
$(document).ready(function () {
{% if not object.pk and not form.errors %}
$('.form-hws').slideUp(function () {
$('.form-is_rig').slideUp();
});
@@ -111,11 +110,9 @@
data-target="{{ form.person.id_for_label }}"/>
</div>
<div class="col-xs-3 align-right">
<button type="button" class="btn btn-default"
data-url="{#% url invoiceitem_add object.pk %#}"
data-toggle="modal" data-target="#itemModal">
<a href="{% url 'person_create' %}" class="btn btn-default modal-href" data-target="#{{ form.person.id_for_label }}">
<span class="glyphicon glyphicon-plus"></span>
</button>
</a>
</div>
</div>
</div>
@@ -138,11 +135,9 @@
data-target="{{ form.organisation.id_for_label }}"/>
</div>
<div class="col-xs-3 align-right">
<button type="button" class="btn btn-default"
data-url="{#% url invoiceitem_add object.pk %#}"
data-toggle="modal" data-target="#itemModal">
<a href="{% url 'organisation_create' %}" class="btn btn-default modal-href" data-target="#{{ form.organisation.id_for_label }}">
<span class="glyphicon glyphicon-plus"></span>
</button>
</a>
</div>
</div>
</div>
@@ -199,11 +194,9 @@
data-target="{{ form.venue.id_for_label }}"/>
</div>
<div class="col-xs-3 align-right">
<button type="button" class="btn btn-default"
data-url="{#% url invoiceitem_add object.pk %#}"
data-toggle="modal" data-target="#itemModal">
<a href="{% url 'venue_create' %}" class="btn btn-default modal-href" data-target="#{{ form.venue.id_for_label }}">
<span class="glyphicon glyphicon-plus"></span>
</button>
</a>
</div>
</div>
</div>

2
RIGS/templates/RIGS/organisation_form.html
View File

@@ -7,7 +7,7 @@
<div class="col-sm-offset-1 col-sm-10">
<h3>{{ object.pk|yesno:"Edit,Add" }} Organisation</h3>
<form action="{{ form.action }}" method="post" class="form-horizontal">{% csrf_token %}
<form action="{{ form.action|default:request.path }}" method="post" class="form-horizontal">{% csrf_token %}
<div class="row">
<div class="col-md-6">
{% include 'form_errors.html' %}

4
RIGS/templates/RIGS/person_form.html
View File

@@ -7,10 +7,10 @@
<div class="col-sm-offset-1 col-sm-10">
<h3>{{ object.pk|yesno:"Edit,Add" }} Person</h3>
<form action="{{ form.action }}" method="post" class="form-horizontal">{% csrf_token %}
<form action="{{ form.action|default:request.path }}" method="post" class="form-horizontal">{% csrf_token %}
<div class="row">
{% include 'form_errors.html' %}
<div class="col-md-6">
{% include 'form_errors.html' %}
<div class="form-group">
<label for="{{ form.name.id_for_label }}"
class="col-sm-2 control-label">{{ form.name.label }}</label>

2
RIGS/templates/RIGS/venue_form.html
View File

@@ -7,7 +7,7 @@
<div class="col-sm-offset-1 col-sm-10">
<h3>{{ object.pk|yesno:"Edit,Add" }} Venue</h3>
<form action="{{ form.action }}" method="post" class="form-horizontal">{% csrf_token %}
<form action="{{ form.action|default:request.path }}" method="post" class="form-horizontal">{% csrf_token %}
<div class="row">
<div class="col-md-6">
{% include 'form_errors.html' %}

70
RIGS/views.py
View File

@@ -69,18 +69,28 @@ class PersonCreate(generic.CreateView):
model = models.Person
def get_success_url(self):
return reverse_lazy('person_detail', kwargs={
'pk': self.object.pk,
})
if self.request.is_ajax():
url = reverse_lazy('closemodal')
messages.info(self.request, "modalobject="+serializers.serialize("json", [self.object]))
else:
url = reverse_lazy('person_detail', kwargs={
'pk': self.object.pk,
})
return url
class PersonUpdate(generic.UpdateView):
model = models.Person
def get_success_url(self):
return reverse_lazy('person_detail', kwargs={
'pk': self.object.pk,
})
if self.request.is_ajax():
url = reverse_lazy('closemodal')
messages.info(self.request, "modalobject="+serializers.serialize("json", [self.object]))
else:
url = reverse_lazy('person_detail', kwargs={
'pk': self.object.pk,
})
return url
class OrganisationList(generic.ListView):
@@ -107,18 +117,28 @@ class OrganisationCreate(generic.CreateView):
model = models.Organisation
def get_success_url(self):
return reverse_lazy('organisation_detail', kwargs={
'pk': self.object.pk,
})
if self.request.is_ajax():
url = reverse_lazy('closemodal')
messages.info(self.request, "modalobject="+serializers.serialize("json", [self.object]))
else:
url = reverse_lazy('organisation_detail', kwargs={
'pk': self.object.pk,
})
return url
class OrganisationUpdate(generic.UpdateView):
model = models.Organisation
def get_success_url(self):
return reverse_lazy('organisation_detail', kwargs={
'pk': self.object.pk,
})
if self.request.is_ajax():
url = reverse_lazy('closemodal')
messages.info(self.request, "modalobject="+serializers.serialize("json", [self.object]))
else:
url = reverse_lazy('organisation_detail', kwargs={
'pk': self.object.pk,
})
return url
class VenueList(generic.ListView):
@@ -145,18 +165,28 @@ class VenueCreate(generic.CreateView):
model = models.Venue
def get_success_url(self):
return reverse_lazy('venue_detail', kwargs={
'pk': self.object.pk,
})
if self.request.is_ajax():
url = reverse_lazy('closemodal')
messages.info(self.request, "modalobject="+serializers.serialize("json", [self.object]))
else:
url = reverse_lazy('venue_detail', kwargs={
'pk': self.object.pk,
})
return url
class VenueUpdate(generic.UpdateView):
model = models.Venue
def get_success_url(self):
return reverse_lazy('venue_detail', kwargs={
'pk': self.object.pk,
})
if self.request.is_ajax():
url = reverse_lazy('closemodal')
messages.info(self.request, "modalobject="+serializers.serialize("json", [self.object]))
else:
url = reverse_lazy('venue_detail', kwargs={
'pk': self.object.pk,
})
return url
class SecureAPIRequest(generic.View):
@@ -189,7 +219,9 @@ class SecureAPIRequest(generic.View):
# Response format where applicable
format = request.GET.get('format', 'json')
fields = request.GET.get('fields', None).split(',')
fields = request.GET.get('fields', None)
if fields:
fields = fields.split(",")
# Supply data for one record
if pk: