fix validation of favorites locations

[qcg-portal.git] / filex / models.py

diff --git a/filex/models.py b/filex/models.py
index d2d3792..235a3f4 100644 (file)
--- a/filex/models.py
+++ b/filex/models.py
@@ -2,11 +2,13 @@
 from django.conf import settings
 from django.db import models
 
+from filex.validators import host_validator, path_validator
+
 
 class Favorite(models.Model):
     owner = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=u"Właściciel", related_name='favorites')
-    host = models.CharField(u"Host", max_length=256)
-    path = models.CharField(u"Ścieżka", max_length=1024, default='~')
+    host = models.CharField(u"Host", max_length=256, validators=[host_validator])
+    path = models.CharField(u"Ścieżka", max_length=1024, default='~', validators=[path_validator])
 
     created = models.DateTimeField(u"Utworzono", auto_now_add=True)
     updated = models.DateTimeField(u"Uaktualniono", auto_now=True)
@@ -17,4 +19,4 @@ class Favorite(models.Model):
         unique_together = ('owner', 'host', 'path')
 
     def __unicode__(self):
-        return u'{}{} ({})'.format(self.host, self.path, self.owner)
+        return u'{}/{} ({})'.format(self.host, self.path, self.owner)