Fix gitlab links

Gust
1 parent bdb676c6
Showing 2 changed files with 31 additions and 3 deletions Show diff stats
colab/plugins/gitlab/migrations/0004_auto_20150630_1149.py
colab/plugins/gitlab/models.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gitlab', '0003_auto_20150211_1203'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='gitlabcomment',
+            name='iid',
+            field=models.IntegerField(null=True),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='gitlabmergerequest',
+            name='iid',
+            field=models.IntegerField(null=True),
+            preserve_default=True,
+        ),
+    ]
@@ -27,6 +27,7 @@ class GitlabProject(models.Model, HitCounterModelMixin):
 class GitlabMergeRequest(Collaboration):
     id = models.IntegerField(primary_key=True)
+    iid = models.IntegerField(null=True)
     target_branch = models.TextField()
     source_branch = models.TextField()
     project = models.ForeignKey(GitlabProject, null=True,
@@ -50,7 +51,7 @@ class GitlabMergeRequest(Collaboration):
     @property
     def url(self):
         return u'/gitlab/{}/merge_requests/{}'.format(
-            self.project.path_with_namespace, self.id)
+            self.project.path_with_namespace, self.iid)
     def get_author(self):
         return self.user
@@ -91,6 +92,7 @@ class GitlabIssue(Collaboration):
 class GitlabComment(Collaboration):
     id = models.IntegerField(primary_key=True)
+    iid = models.IntegerField(null=True)
     body = models.TextField()
     created_at = models.DateTimeField(blank=True, null=True)
     issue_comment = models.BooleanField(default=True)
@@ -133,10 +135,10 @@ class GitlabComment(Collaboration):
     def url(self):
         if self.issue_comment:
             return u'/gitlab/{}/issues/{}#notes_{}'.format(
-                self.project.path_with_namespace, self.parent_id, self.id)
+                self.project.path_with_namespace, self.parent_id, self.iid)
         else:
             return u'/gitlab/{}/merge_requests/{}#notes_{}'.format(
-                self.project.path_with_namespace, self.parent_id, self.id)
+                self.project.path_with_namespace, self.parent_id, self.iid)
     class Meta:
         verbose_name = _('Gitlab Comments')
@@ -0,0 +1,26 @@		@@ -0,0 +1,26 @@
	1	+# -- coding: utf-8 --
	2	+from __future__ import unicode_literals
	3	+
	4	+from django.db import models, migrations
	5	+
	6	+
	7	+class Migration(migrations.Migration):
	8	+
	9	+ dependencies = [
	10	+ ('gitlab', '0003_auto_20150211_1203'),
	11	+ ]
	12	+
	13	+ operations = [
	14	+ migrations.AddField(
	15	+ model_name='gitlabcomment',
	16	+ name='iid',
	17	+ field=models.IntegerField(null=True),
	18	+ preserve_default=True,
	19	+ ),
	20	+ migrations.AddField(
	21	+ model_name='gitlabmergerequest',
	22	+ name='iid',
	23	+ field=models.IntegerField(null=True),
	24	+ preserve_default=True,
	25	+ ),
	26	+ ]