Apply Revision

Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com>

Apply Revision
Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com>
Thiago Ribeiro · Sergio Oliveira
1 parent d1726b36
Showing 6 changed files with 71 additions and 19 deletions Show diff stats
colab/proxy/trac/data_api.py
colab/proxy/trac/models.py
colab/proxy/trac/templates/search/indexes/trac/attachment_text.txt
colab/proxy/trac/templates/search/indexes/trac/revision_text.txt
colab/proxy/trac/templates/search/indexes/trac/ticket_text.txt
docs/source/user.rst
@@ -76,7 +76,8 @@ class TracDataAPI(ProxyDataAPI):
             revision.message = line['message']
             revision.description = revision.message
             revision.created = self.get_revision_created(cursor, line['rev'])
-            revision.repository_name = repository_dict[line['repos']]
+            revision.repository_name = line['repos']
+            revision.save()
     def fetch_data_ticket(self, empty_cursor):
         """ This method is responsible for seeking the ticket data in
@@ -106,16 +107,24 @@ class TracDataAPI(ProxyDataAPI):
             ticket.reporter = line['reporter']
             ticket.status = line['status']
             ticket.tag = ticket.status
-            ticket.keywords = line['keywords']
-            ticket.owner = line['owner']
-            ticket.resolution = line['resolution']
+            if line['keywords']:
+                ticket.keywords = line['keywords']
+            if line['owner']:
+                ticket.owner = line['owner']
+            else:
+                ticket.owner = 'Anonymous'
+            if line['resolution']:
+                ticket.resolution = line['resolution']
+            else:
+                ticket.resolution = 'no resolution'
             ticket.author = ticket.reporter
             ticket.created = self.get_ticket_created(cursor, line['id'])
             ticket.modified = self.get_ticket_modified(cursor, line['id'])
-            ticket.modified_by = ticket.author
             if line['reporter'] not in collaborators:
                 collaborators.append(line['reporter'])
             ticket.collaborators = collaborators
+            ticket.update_user(ticket.author)
+            ticket.save()
     def fetch_data_wiki(self, empty_cursor):
         """ This method is responsible for seeking the wiki data in
@@ -136,7 +145,7 @@ class TracDataAPI(ProxyDataAPI):
         for line in wiki_dict:
             wiki.update_user(line['author'])
             wiki.title = line['name']
-            wiki.text = line['text']
+            wiki.wiki_text = line['text']
             wiki.author = line['author']
             if line['author'] not in collaborators:
                     collaborators.append(line['author'])
@@ -49,7 +49,6 @@ class Attachment(models.Model, HitCounterModelMixin):
         except User.DoesNotExist:
             return None
-
 class Revision(models.Model, HitCounterModelMixin):
     update_field = 'created'
     icon_name = 'align-right'
@@ -78,7 +77,7 @@ class Revision(models.Model, HitCounterModelMixin):
             return None
-class Ticket(models.Model, HitCounterModelMixin):
+class Ticket(Collaboration, HitCounterModelMixin):
     icon_name = 'tag'
     type = 'ticket'
     summary = models.TextField(blank=True)
@@ -96,7 +95,6 @@ class Ticket(models.Model, HitCounterModelMixin):
     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)
     owner = models.TextField(blank=True)
     resolution = models.TextField(blank=True)
@@ -0,0 +1,15 @@
+{{ object.filename }}
+{{ object.filename|slugify }}
+{{ object.description }}
+{{ object.description|slugify }}
+{{ object.used_by }}
+{{ object.mimetype }}
+{{ object.get_author.get_full_name }}
+
+{% for k, v in extracted.metadata.items %}
+  {% for val in v %}
+    {{ k }}: {{ val|safe }}
+  {% endfor %}
+{% endfor %}
+
+{{ extracted.contents|striptags|safe }}
@@ -0,0 +1,8 @@
+{{ object.repository_name }}
+{{ object.repository_name|slugify }}
+{{ object.rev }}
+{{ object.rev|slugify }}
+{% firstof object.get_author.get_full_name object.author %}
+{% firstof object.get_author.get_full_name|slugify object.author|slugify %}
+{{ object.message }}
+{{ object.message|slugify }}
@@ -0,0 +1,20 @@
+{{ object.summary }}
+{{ object.summary|slugify }}
+{{ object.description }}
+{{ object.description|slugify }}
+{{ object.milestone }}
+{{ object.milestone|slugify }}
+{{ object.component|slugify }}
+{{ object.version }}
+{{ object.severity }}
+{{ object.severity|slugify }}
+{{ object.reporter }}
+{{ object.reporter|slugify }}
+{% firstof object.get_author.get_fullname or object.author %}
+{% firstof object.get_author.get_fullname|slugify or object.author|slugify %}
+{{ object.status }}
+{{ object.status|slugify }}
+{{ object.keywords }}
+{{ object.keywords|slugify }}
+{{ object.collaborators }}
+{{ object.collaborators|slugify }}
@@ -30,6 +30,8 @@ Since Trac already installed:
 To enable Trac plugin must first configure the trac database in /etc/colab/settings.yml:
+1. vim /etc/colab/settings.yaml
+
 .. code-block:: yaml
   DATABASES:
@@ -39,12 +41,12 @@ To enable Trac plugin must first configure the trac database in /etc/colab/setti
       NAME: colab
       USER: colab
       PASSWORD: colab
-  trac:
-  ENGINE: django.db.backends.postgresql_psycopg2
-  HOST: localhost
-  NAME: trac
-  USER: colab
-  PASSWORD: colab
+    trac:
+    ENGINE: django.db.backends.postgresql_psycopg2
+    HOST: localhost
+    NAME: trac
+    USER: colab
+    PASSWORD: colab
 - Yet this file uncomment in PROXIED_APPS the Trac:
@@ -68,16 +70,16 @@ To enable Trac plugin must first configure the trac database in /etc/colab/setti
 .. code-block:: sh
-  # Since you are in the folder colab 
+  # Since you are in the folder colab
   $ workon colab
-  $ colab-admin makemigrations trac
-  $ colab-admin migrate
+  $ colab-admin makemigrations
+  $ colab-admin migrate trac
 - Finally, just import the Trac data (may take a few minutes):
 .. code-block:: sh
-  # Since you are in the folder colab 
+  # Since you are in the folder colab
   $ colab-admin import_proxy_data
 Settings
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+{{ object.filename }}
	2	+{{ object.filename\|slugify }}
	3	+{{ object.description }}
	4	+{{ object.description\|slugify }}
	5	+{{ object.used_by }}
	6	+{{ object.mimetype }}
	7	+{{ object.get_author.get_full_name }}
	8	+
	9	+{% for k, v in extracted.metadata.items %}
	10	+ {% for val in v %}
	11	+ {{ k }}: {{ val\|safe }}
	12	+ {% endfor %}
	13	+{% endfor %}
	14	+
	15	+{{ extracted.contents\|striptags\|safe }}
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+{{ object.repository_name }}
	2	+{{ object.repository_name\|slugify }}
	3	+{{ object.rev }}
	4	+{{ object.rev\|slugify }}
	5	+{% firstof object.get_author.get_full_name object.author %}
	6	+{% firstof object.get_author.get_full_name\|slugify object.author\|slugify %}
	7	+{{ object.message }}
	8	+{{ object.message\|slugify }}
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+{{ object.summary }}
	2	+{{ object.summary\|slugify }}
	3	+{{ object.description }}
	4	+{{ object.description\|slugify }}
	5	+{{ object.milestone }}
	6	+{{ object.milestone\|slugify }}
	7	+{{ object.component\|slugify }}
	8	+{{ object.version }}
	9	+{{ object.severity }}
	10	+{{ object.severity\|slugify }}
	11	+{{ object.reporter }}
	12	+{{ object.reporter\|slugify }}
	13	+{% firstof object.get_author.get_fullname or object.author %}
	14	+{% firstof object.get_author.get_fullname\|slugify or object.author\|slugify %}
	15	+{{ object.status }}
	16	+{{ object.status\|slugify }}
	17	+{{ object.keywords }}
	18	+{{ object.keywords\|slugify }}
	19	+{{ object.collaborators }}
	20	+{{ object.collaborators\|slugify }}