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

Fixed merge issues

Browse Source
This commit is contained in:
David Taylor
2016-07-10 12:50:14 +01:00
parent 03f7709769
commit c1b416251c
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RIGS/finance.py
View File

@@ -100,7 +100,6 @@ class InvoiceArchive(generic.ListView):
model = models.Invoice
template_name = 'RIGS/invoice_list_archive.html'
paginate_by = 25
template_name="RIGS/invoice_archive.html"
def get_queryset(self):
q = self.request.GET.get('q', "")

12
RIGS/templates/RIGS/invoice_archive.html
View File

@@ -1,12 +0,0 @@
{% extends 'RIGS/invoice_list.html' %}
{% block search %}
<div class="col-sm-3 col-sm-offset-9">
<form class="form form-horizontal col-sm-12">
<div class="form-group">
<input type="search" name="q" placeholder="Search" value="{{ request.GET.q }}"
class="form-control"/>
</div>
</form>
</div>
{% endblock %}

1
RIGS/templates/RIGS/invoice_list.html
View File

@@ -12,6 +12,7 @@
{% paginator %}
</div>
{% endif %}
{% block search %}{% endblock %}
<div class="table-responsive col-sm-12">
<table class="table table-hover">
<thead>

11
RIGS/templates/RIGS/invoice_list_archive.html
View File

@@ -10,4 +10,15 @@ All Invoices
{% block description %}
<p>This page displays all invoices: outstanding, paid, and void</p>
{% endblock %}
{% block search %}
<div class="col-sm-3 col-sm-offset-9">
<form class="form form-horizontal col-sm-12">
<div class="form-group">
<input type="search" name="q" placeholder="Search" value="{{ request.GET.q }}"
class="form-control"/>
</div>
</form>
</div>
{% endblock %}