Gustavo Jaruga Cruz · Sergio Oliveira · Gust · Gust · Sergio Oliveira · Gustavo Jaruga Cruz
Showing 2 changed files 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)
@@ -132,11 +134,12 @@ class GitlabComment(Collaboration):
     @property
     def url(self):
         if self.issue_comment:
-            return u'/gitlab/{}/issues/{}#notes_{}'.format(
-                self.project.path_with_namespace, self.parent_id, self.id)
+            url_str = u'/gitlab/{}/issues/{}#notes_{}'
         else:
-            return u'/gitlab/{}/merge_requests/{}#notes_{}'.format(
-                self.project.path_with_namespace, self.parent_id, self.id)
+            url_str = u'/gitlab/{}/merge_requests/{}#notes_{}'
+
+        return url_str.format(self.project.path_with_namespace,
+            self.parent_id, self.iid)
  
     class Meta:
         verbose_name = _('Gitlab Comments')
 class GitlabMergeRequest(Collaboration):
  
     id = models.IntegerField(primary_key=True)
+    iid = models.IntegerField(null=True)
     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)
...	...	@@ -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	+ ]
...	...
...	...	@@ -27,6 +27,7 @@ class GitlabProject(models.Model, HitCounterModelMixin):
27	27	class GitlabMergeRequest(Collaboration):
28	28
29	29	id = models.IntegerField(primary_key=True)
	30	+ iid = models.IntegerField(null=True)
4		Link here Sergio Oliveira @seocam 2015-07-02 14:11:52 UTC (Edited 2015-07-02 14:12:31 UTC ) What does this second "i" stands for? Can't it be `merge_request_id` or `mr_id`? Write Preview What does this second "i" stands for? Can't it be `merge_request_id` or `mr_id`? Choose File ... File name... Cancel Link here Gustavo Jaruga Cruz @darksshades 2015-07-02 14:33:30 UTC I stands for the id inside a project. The 'id' is the unique identifier white the 'iid' is the id counter inside a project. Write Preview I stands for the id inside a project. The 'id' is the unique identifier white the 'iid' is the id counter inside a project. Choose File ... File name... Cancel Link here Gustavo Jaruga Cruz @darksshades 2015-07-02 14:36:27 UTC We use 'iid' to follow gitlab_api rules, doing that, the json parser automatically parser the values without any aditional 'if's in the code Write Preview We use 'iid' to follow gitlab_api rules, doing that, the json parser automatically parser the values without any aditional 'if's in the code Choose File ... File name... Cancel Link here Sergio Oliveira @seocam 2015-07-02 16:03:40 UTC Ok. Write Preview Ok. Choose File ... File name... Cancel
30	31	target_branch = models.TextField()
31	32	source_branch = models.TextField()
32	33	project = models.ForeignKey(GitlabProject, null=True,
...	...	@@ -50,7 +51,7 @@ class GitlabMergeRequest(Collaboration):
50	51	@property
51	52	def url(self):
52	53	return u'/gitlab/{}/merge_requests/{}'.format(
53		- self.project.path_with_namespace, self.id)
	54	+ self.project.path_with_namespace, self.iid)
54	55
55	56	def get_author(self):
56	57	return self.user
...	...	@@ -91,6 +92,7 @@ class GitlabIssue(Collaboration):
91	92	class GitlabComment(Collaboration):
92	93
93	94	id = models.IntegerField(primary_key=True)
	95	+ iid = models.IntegerField(null=True)
94	96	body = models.TextField()
95	97	created_at = models.DateTimeField(blank=True, null=True)
96	98	issue_comment = models.BooleanField(default=True)
...	...	@@ -132,11 +134,12 @@ class GitlabComment(Collaboration):
132	134	@property
133	135	def url(self):
134	136	if self.issue_comment:
135		- return u'/gitlab/{}/issues/{}#notes_{}'.format(
136		- self.project.path_with_namespace, self.parent_id, self.id)
	137	+ url_str = u'/gitlab/{}/issues/{}#notes_{}'
137	138	else:
138		- return u'/gitlab/{}/merge_requests/{}#notes_{}'.format(
139		- self.project.path_with_namespace, self.parent_id, self.id)
	139	+ url_str = u'/gitlab/{}/merge_requests/{}#notes_{}'
	140	+
	141	+ return url_str.format(self.project.path_with_namespace,
	142	+ self.parent_id, self.iid)
140	143
141	144	class Meta:
142	145	verbose_name = _('Gitlab Comments')
...	...
133	135	def url(self):
134	136	if self.issue_comment:
135	137	return u'/gitlab/{}/issues/{}#notes_{}'.format(
136		- self.project.path_with_namespace, self.parent_id, self.id)
	138	+ self.project.path_with_namespace, self.parent_id, self.iid)
2		Link here Sergio Oliveira @seocam 2015-07-02 16:04:59 UTC Note that both parts of the conditional are pretty much the same. It would be better refactor to keep only the template string and format just once afterward. Write Preview Note that both parts of the conditional are pretty much the same. It would be better refactor to keep only the template string and format just once afterward. Choose File ... File name... Cancel Link here Gustavo Jaruga Cruz @darksshades 2015-07-02 16:17:51 UTC Makes sense, commited on new commit. Write Preview Makes sense, commited on new commit. Choose File ... File name... Cancel