[Fixes #4011] Encoding Issues with Resource having non-UTF8 characte…

…rs on title and/or "upload-sessions" (#4012)

* [Fixes #4011] Encoding Issues with Resource having non-UTF8 characters on title and/or 'upload-sessions'

* [Fixes #4011] Encoding Issues with Resource having non-UTF8 characters on title and/or 'upload-sessions'

* [Fixes #4011] Encoding Issues with Resource having non-UTF8 characters on title and/or 'upload-sessions'

* [Fixes #4011] Encoding Issues with Resource having non-UTF8 characters on title and/or 'upload-sessions'

geonode/base/models.py

@@ -158,7 +158,7 @@ class SpatialRepresentationType(models.Model):
     is_choice = models.BooleanField(default=True)
 
     def __unicode__(self):
-        return self.gn_description
+        return u"{0}".format(self.gn_description)
 
     class Meta:
         ordering = ("identifier",)
@@ -211,7 +211,7 @@ class Region(MPTTModel):
         default='EPSG:4326')
 
     def __unicode__(self):
-        return self.name
+        return u"{0}".format(self.name)
 
     @property
     def bbox(self):
@@ -260,7 +260,7 @@ class RestrictionCodeType(models.Model):
     is_choice = models.BooleanField(default=True)
 
     def __unicode__(self):
-        return self.gn_description
+        return u"{0}".format(self.gn_description)
 
     class Meta:
         ordering = ("identifier",)
@@ -289,7 +289,7 @@ class License(models.Model):
     license_text = models.TextField(null=True, blank=True)
 
     def __unicode__(self):
-        return self.name
+        return u"{0}".format(self.name)
 
     @property
     def name_long(self):
@@ -763,7 +763,7 @@ class ResourceBase(PolymorphicModel, PermissionLevelMixin, ItemBase):
     rating = models.IntegerField(default=0, null=True, blank=True)
 
     def __unicode__(self):
-        return self.title
+        return u"{0}".format(self.title)
 
     def get_upload_session(self):
         raise NotImplementedError()
@@ -1310,8 +1310,8 @@ class Link(models.Model):
 
     objects = LinkManager()
 
-    def __str__(self):
-        return '%s link' % self.link_type
+    def __unicode__(self):
+        return u"{0} link".format(self.link_type)
 
 
 def resourcebase_post_save(instance, *args, **kwargs):

geonode/groups/tests.py

@@ -21,6 +21,7 @@
 from geonode.tests.base import GeoNodeBaseTestSupport
 
 import json
+import logging
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from django.core.files.uploadedfile import SimpleUploadedFile
@@ -36,6 +37,12 @@
 from geonode.maps.models import Map
 from geonode.security.views import _perms_info_json
 
+logger = logging.getLogger(__name__)
+
+
+def _log(msg, *args):
+    logger.debug(msg, *args)
+
 
 class SmokeTest(GeoNodeBaseTestSupport):
     """
@@ -480,8 +487,9 @@ def test_group_activity_pages_render(self):
 
             response = self.client.get("/groups/group/bar/activity/")
             self.assertEqual(200, response.status_code)
+            _log(response)
             self.assertContains(response,
-                                '<a href="/layers/geonode:CA">CA</a>',
+                                '<a href="/layers/geonode:CA">geonode:CA</a>',
                                 count=2,
                                 status_code=200,
                                 msg_prefix='',

geonode/layers/models.py

@@ -29,7 +29,6 @@
 from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse
 from django.core.files.storage import FileSystemStorage
-
 from geonode.base.models import ResourceBase, ResourceBaseManager, resourcebase_post_save
 from geonode.people.utils import get_valid_user
 from agon_ratings.models import OverallRating
@@ -81,8 +80,8 @@ class Style(models.Model, PermissionLevelMixin):
     sld_url = models.CharField(_('sld url'), null=True, max_length=1000)
     workspace = models.CharField(max_length=255, null=True, blank=True)
 
-    def __str__(self):
-        return "%s" % self.name.encode('utf-8')
+    def __unicode__(self):
+        return u"%s" % self.name
 
     def absolute_url(self):
         if self.sld_url:
@@ -269,8 +268,8 @@ def attribute_config(self):
             }
         return cfg
 
-    def __str__(self):
-        return self.alternate
+    def __unicode__(self):
+        return u"{0}".format(self.alternate)
         # if self.alternate is not None:
         #     return "%s Layer" % self.service_typename.encode('utf-8')
         # elif self.name is not None:
@@ -349,8 +348,12 @@ class UploadSession(models.Model):
     def successful(self):
         return self.processed and self.errors is None
 
-    def __str__(self):
-        return u'%s' % self.resource or self.date
+    def __unicode__(self):
+        try:
+            _s = '%s' % self.resource or self.date
+        except BaseException:
+            _s = '%s' % self.date
+        return u"{0}".format(_s)
 
 
 class LayerFile(models.Model):
@@ -490,7 +493,7 @@ class Attribute(models.Model):
 
     objects = AttributeManager()
 
-    def __str__(self):
+    def __unicode__(self):
         return "%s" % self.attribute_label.encode(
             "utf-8") if self.attribute_label else self.attribute.encode("utf-8")
 

geonode/templates/base.html

@@ -46,6 +46,9 @@
         {% if custom_theme.logo %}
         .navbar-brand {
           background-image: url({{ custom_theme.logo.url }});
+          background-repeat: no-repeat;
+          background-position: center;
+          background-size: contain;
         }
         {% endif %}
 
@@ -65,7 +68,7 @@
         .home .jumbotron .container {
           position: relative;
           z-index: 1;
-        }        
+        }
         .home .jumbotron:after {
           content: "";
           background-image: url({{ custom_theme.jumbotron_bg.url }});

geonode/templates/index.html

@@ -311,7 +311,7 @@ <h4>{{ item.title | limitTo: 20 }}{{item.title.length > 20 ? '...' : ''}}</h4>
         </div>
       </section>
       {% endblock showcase %}
-      {% block partners %} 
+      {% block partners %}
         {% if custom_theme.partners.all %}
         <section id="partners">
         <div class="container text-center">
@@ -327,7 +327,7 @@ <h2>{{ custom_theme.partners_title|default:_("Our partners") }}</h2>
         </div>
         </section>
         {% endif %}
-      {% endblock partners %} 
+      {% endblock partners %}
 
   {% endblock mainbody %}