From 6961d1c2b756d254a10fcc440de4e442ce40eda3 Mon Sep 17 00:00:00 2001
From: Thiago Ribeiro <thiagitosouza@hotmail.com>
Date: Mon, 9 Feb 2015 16:47:07 -0200
Subject: [PATCH] Attributes Wiki according to Haystack.

---
 colab/proxy/trac/data_api.py |  4 ++--
 colab/proxy/trac/models.py   | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/colab/proxy/trac/data_api.py b/colab/proxy/trac/data_api.py
index 5214a3a..cce796f 100644
--- a/colab/proxy/trac/data_api.py
+++ b/colab/proxy/trac/data_api.py
@@ -84,7 +84,8 @@ class TracDataAPI(ProxyDataAPI):
         collaborators = []
 
         for line in wiki_dict:
-            wiki.name = line['name']
+            wiki.update_user(line['author'])
+            wiki.title = line['name']
             wiki.text = line['text']
             wiki.author = line['author']
             if line['author'] not in collaborators:
@@ -94,7 +95,6 @@ class TracDataAPI(ProxyDataAPI):
             wiki.created = time.strftime('%Y-%m-%d %H:%M:%S',
                                          time.localtime(local_time))
             wiki.modified = str(timezone.now())
-            wiki.modified_by = wiki.author
             wiki.save()
 
     def dictfetchall(self, cursor):
diff --git a/colab/proxy/trac/models.py b/colab/proxy/trac/models.py
index dc85fd3..d505c4e 100644
--- a/colab/proxy/trac/models.py
+++ b/colab/proxy/trac/models.py
@@ -7,6 +7,7 @@ from django.conf import settings
 
 from hitcounter.models import HitCounterModelMixin
 
+from colab.proxy.utils.models import Collaboration
 from colab.accounts.models import User
 from django.utils.translation import ugettext_lazy as _
 
@@ -105,14 +106,19 @@ class Ticket(models.Model, HitCounterModelMixin):
             return None
 
 
-class Wiki(models.Model, HitCounterModelMixin):
-    name = models.TextField(primary_key=True)
+class Wiki(Collaboration, HitCounterModelMixin):
+    type = "wiki"
+    icon_name = "book"
+    title = models.TextField(primary_key=True)
     wiki_text = models.TextField(blank=True)
     author = models.TextField(blank=True)
     collaborators = models.TextField(blank=True)
     created = models.DateTimeField(blank=True, null=True)
     modified = models.DateTimeField(blank=True, null=True)
-    modified_by = models.TextField(blank=True)
+
+    @property
+    def description(self):
+        return u'{}\n{}'.format(self.wiki_text, self.collaborators)        
 
     class Meta:
         verbose_name = _('Attachment')
--
libgit2 0.21.2