Skip to content

Commit

Permalink
Merge f4644cf into d175399
Browse files Browse the repository at this point in the history
  • Loading branch information
mkoistinen committed Apr 25, 2016
2 parents d175399 + f4644cf commit 8937185
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions aldryn_apphooks_config/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from app_data import AppDataField
from django.db import models
from django.utils.encoding import python_2_unicode_compatible
from django.utils.html import escape
from django.utils.translation import ugettext_lazy as _


Expand Down Expand Up @@ -33,9 +34,9 @@ def save(self, *args, **kwargs):

def __str__(self):
if self.cmsapp:
return _('%s / %s') % (self.cmsapp.name, self.namespace)
return _('%s / %s') % (escape(self.cmsapp.name), escape(self.namespace))
else:
return _('%s / %s') % (self.type, self.namespace)
return _('%s / %s') % (escape(self.type), escape(self.namespace))

def __getattr__(self, item):
"""
Expand Down

0 comments on commit 8937185

Please sign in to comment.