Refactoring questions.views

[prawokultury.git] / questions / models.py

diff --git a/questions/models.py b/questions/models.py
index 1540191..746ad84 100644 (file)
--- a/questions/models.py
+++ b/questions/models.py
@@ -12,6 +12,18 @@ from taggit_autosuggest.managers import TaggableManager
 from fnpdjango.utils.text.slughifi import slughifi
 
 
 from fnpdjango.utils.text.slughifi import slughifi
 
 

+class TagCategory(models.Model):
+    name = models.CharField(verbose_name=_('Name'), unique = True, max_length = 100)
+    slug = models.SlugField(verbose_name=_('Slug'), unique = True, max_length = 100)
+
+    class Meta:
+        verbose_name = _("Tag Category")
+        verbose_name_plural = _("Tag Categories")
+        
+    def __unicode__(self):
+        return self.name
+    
+    

 class Tag(TagBase):
     def slugify(self, tag, i=None):
         slug = slughifi(tag)
 class Tag(TagBase):
     def slugify(self, tag, i=None):
         slug = slughifi(tag)


@@ -19,6 +31,9 @@ class Tag(TagBase):
             slug += "_%d" % i
         return slug
 
             slug += "_%d" % i
         return slug
 

+    category = models.ForeignKey(TagCategory, blank = True, null = True, on_delete = models.SET_NULL, related_name = 'tags')
+    click_count = models.IntegerField(null = False, default = 0)
+    

     class Meta:
         verbose_name = _("Tag")
         verbose_name_plural = _("Tags")
     class Meta:
         verbose_name = _("Tag")
         verbose_name_plural = _("Tags")


@@ -45,7 +60,7 @@ class Question(models.Model):
         help_text=_('Check to display answered question on site.'))
     published_at = models.DateTimeField(_('published at'), null=True, blank=True, db_index=True)
 
         help_text=_('Check to display answered question on site.'))
     published_at = models.DateTimeField(_('published at'), null=True, blank=True, db_index=True)
 

-    tags = TaggableManager(through=TagItem)
+    tags = TaggableManager(through=TagItem, blank=True)

 
     class Meta:
         ordering = ['-created_at']
 
     class Meta:
         ordering = ['-created_at']