CAMP/manifests
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

good names none

Browse Source
This commit is contained in:
Sanj 2012-04-22 22:22:46 +05:30
parent 0bfe0beb12
commit 88dd7a4955
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/ships/models.py
View File

@ -87,9 +87,9 @@ class Good(models.Model):
value = models.IntegerField(max_length=20, null=True) value = models.IntegerField(max_length=20, null=True)
def get_description(self): def get_description(self):
if self.description_string_trans != '': if self.description_string_trans != None:
return self.description_string_trans return self.description_string_trans
if self.description_string != '': if self.description_string != None:
return self.description_string return self.description_string
else: else:
return self.description return self.description

4
manifests/templates/shipList.html
View File

@ -33,7 +33,7 @@ $(function() {
<body> <body>
<div id="wrapper"> <div id="wrapper">
<div id="status"> <div id="status">
No of results: {{ no_of_results }} &nbsp; displaying page {{ page }} of {{ no_of_pages }} &nbsp; Results per page: {{ page_size }} &nbsp; {% if has_previous %} <span class="prevBtn pageBtn">Previous Page</span> {% endif %}&nbsp;&nbsp; {% if has_next %} <span class="nextBtn pageBtn">Next Page</span> {% endif %} No of results: {{ no_of_results }} &nbsp; Displaying page {{ page }} of {{ no_of_pages }} &nbsp; Results per page: {{ page_size }} &nbsp; {% if has_previous %} <span class="prevBtn pageBtn">Previous Page</span> {% endif %}&nbsp;&nbsp; {% if has_next %} <span class="nextBtn pageBtn">Next Page</span> {% endif %}
</div> </div>
<div id="formDiv"> <div id="formDiv">
<form id="shipFilterForm" action="" method="GET"> <form id="shipFilterForm" action="" method="GET">
@ -95,7 +95,7 @@ No of results: {{ no_of_results }} &nbsp; displaying page {{ page }} of {{ no_of
<table> <table>
<thead> <thead>
<tr> <tr>
<td>Ship Number</td> <td>Ship No</td>
<td>Bill Type</td> <td>Bill Type</td>
<td>Date</td> <td>Date</td>
<td>Ship Name</td> <td>Ship Name</td>