Commit f54e5a1a authored by svilayphiou's avatar svilayphiou

merging change on etherpadlite/models by Gijs on Contour branch

parent b43d6228
......@@ -49,7 +49,7 @@ class PadGroup(models.Model):
verbose_name = _('group')
def __str__(self):
return self.group
return self.group.__str__()
@property
def epclient(self):
......@@ -162,7 +162,7 @@ class Pad(models.Model):
"""Schema and methods for etherpad-lite pads
"""
name = models.CharField(max_length=50)
display_slug = models.CharField(max_length=256, blank=True, verbose_name="Name as used in URL (use :: for namespacing)")
display_slug = models.CharField(max_length=255, blank=True, verbose_name="Name as used in URL (use :: for namespacing)", unique=True)
# I’m putting this back. We don’t use it anymore, but putting in the migration is
# more hassle then it’s worth
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment