From 88dd7a495527a00dda4f92eb368dd984181690e8 Mon Sep 17 00:00:00 2001 From: Sanj Date: Sun, 22 Apr 2012 22:22:46 +0530 Subject: [PATCH] good names none --- manifests/ships/models.py | 4 ++-- manifests/templates/shipList.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/ships/models.py b/manifests/ships/models.py index 3e97120..74554d8 100644 --- a/manifests/ships/models.py +++ b/manifests/ships/models.py @@ -87,9 +87,9 @@ class Good(models.Model): value = models.IntegerField(max_length=20, null=True) def get_description(self): - if self.description_string_trans != '': + if self.description_string_trans != None: return self.description_string_trans - if self.description_string != '': + if self.description_string != None: return self.description_string else: return self.description diff --git a/manifests/templates/shipList.html b/manifests/templates/shipList.html index f6894fa..027d751 100644 --- a/manifests/templates/shipList.html +++ b/manifests/templates/shipList.html @@ -33,7 +33,7 @@ $(function() {
-No of results: {{ no_of_results }}   displaying page {{ page }} of {{ no_of_pages }}   Results per page: {{ page_size }}   {% if has_previous %} Previous Page {% endif %}   {% if has_next %} Next Page {% endif %} +No of results: {{ no_of_results }}   Displaying page {{ page }} of {{ no_of_pages }}   Results per page: {{ page_size }}   {% if has_previous %} Previous Page {% endif %}   {% if has_next %} Next Page {% endif %}
@@ -95,7 +95,7 @@ No of results: {{ no_of_results }}   displaying page {{ page }} of {{ no_of - +
Ship NumberShip No Bill Type Date Ship Name