Refactor url method of mr/issue

Gust
1 parent d9198a01
Showing 1 changed file with 5 additions and 4 deletions Show diff stats
colab/plugins/gitlab/models.py
@@ -134,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.iid)
+            url_str = u'/gitlab/{}/issues/{}#notes_{}'
         else:
-            return u'/gitlab/{}/merge_requests/{}#notes_{}'.format(
-                self.project.path_with_namespace, self.parent_id, self.iid)
+            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')
...	...	@@ -134,11 +134,12 @@ class GitlabComment(Collaboration):
134	134	@property
135	135	def url(self):
136	136	if self.issue_comment:
137		- return u'/gitlab/{}/issues/{}#notes_{}'.format(
138		- self.project.path_with_namespace, self.parent_id, self.iid)
	137	+ url_str = u'/gitlab/{}/issues/{}#notes_{}'
139	138	else:
140		- return u'/gitlab/{}/merge_requests/{}#notes_{}'.format(
141		- self.project.path_with_namespace, self.parent_id, self.iid)
	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)
142	143
143	144	class Meta:
144	145	verbose_name = _('Gitlab Comments')
...	...