Merge branch 'master' of portal.softwarepublico.gov.br:softwarepublico/colab

Sergio Oliveira
2 parents 692253bb a70fae9a
Showing 5 changed files with 36 additions and 5 deletions Show diff stats
MANIFEST.in
colab/plugins/gitlab/migrations/0004_auto_20150630_1149.py
colab/plugins/gitlab/models.py
colab/settings.py
colab/super_archives/locale/pt_BR/LC_MESSAGES/django.mo
@@ -2,6 +2,7 @@ include README.rst
 include MANIFEST.in
 recursive-include colab/static *
 recursive-include colab/locale *
+recursive-include colab/super_archives/locale *
 recursive-include colab/proxy/noosfero/static *
 recursive-include colab *.html *.txt *.xml
 recursive-include misc *
@@ -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')
@@ -211,6 +211,7 @@ AUTHENTICATION_BACKENDS = (
  
 LOCALE_PATHS = (
     os.path.join(BASE_DIR, 'locale'),
+    os.path.join(BASE_DIR, 'super_archives/locale'),
 )
  
 AUTH_USER_MODEL = 'accounts.User'
...	...	@@ -2,6 +2,7 @@ include README.rst
2	2	include MANIFEST.in
3	3	recursive-include colab/static *
4	4	recursive-include colab/locale *
	5	+recursive-include colab/super_archives/locale *
5	6	recursive-include colab/proxy/noosfero/static *
6	7	recursive-include colab .html .txt *.xml
7	8	recursive-include misc *
...	...
...	...	@@ -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)
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')
...	...
...	...	@@ -211,6 +211,7 @@ AUTHENTICATION_BACKENDS = (
211	211
212	212	LOCALE_PATHS = (
213	213	os.path.join(BASE_DIR, 'locale'),
	214	+ os.path.join(BASE_DIR, 'super_archives/locale'),
214	215	)
215	216
216	217	AUTH_USER_MODEL = 'accounts.User'
...	...