Merge pull request DefectDojo#6982 from DefectDojo/release/2.15.1

Maffooch · web-flow · commit cb6c8cc8ed69 · 2022-10-13T00:47:09.000-05:00
Release: Merge release into master from: release/2.15.1
diff --git a/components/package.json b/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "license" : "BSD-3-Clause",
   "private": true,
   "dependencies": {
diff --git a/dojo/__init__.py b/dojo/__init__.py
@@ -4,6 +4,6 @@
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app  # noqa
 
-__version__ = '2.15.0'
+__version__ = '2.15.1'
 __url__ = 'https://github.com/DefectDojo/django-DefectDojo'
 __docs__ = 'https://documentation.defectdojo.com'
diff --git a/dojo/models.py b/dojo/models.py
@@ -2802,13 +2802,18 @@ def get_file_path_with_link(self):
             return None
         if self.test.engagement.source_code_management_uri is None:
             return escape(self.file_path)
+        link = self.test.engagement.source_code_management_uri
         if "https://github.com/" in self.test.engagement.source_code_management_uri:
-            if self.test.engagement.commit_hash is not None:
-                link = self.test.engagement.source_code_management_uri + '/blob/' + self.test.engagement.commit_hash + '/' + self.file_path
+            if self.test.commit_hash is not None:
+                link += '/blob/' + self.test.commit_hash + '/' + self.file_path
+            elif self.test.engagement.commit_hash is not None:
+                link += '/blob/' + self.test.engagement.commit_hash + '/' + self.file_path
+            elif self.test.branch_tag is not None:
+                link += '/blob/' + self.test.branch_tag + '/' + self.file_path
             elif self.test.engagement.branch_tag is not None:
-                link = self.test.engagement.source_code_management_uri + '/blob/' + self.test.engagement.branch_tag + '/' + self.file_path
+                link += '/blob/' + self.test.engagement.branch_tag + '/' + self.file_path
         else:
-            link = self.test.engagement.source_code_management_uri + '/' + self.file_path
+            link += '/' + self.file_path
         if self.line:
             link = link + '#L' + str(self.line)
         return create_bleached_link(link, self.file_path)
diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "2.15.0"
+appVersion: "2.15.1"
 description: A Helm chart for Kubernetes to install DefectDojo
 name: defectdojo
-version: 1.6.42
+version: 1.6.43
 icon: https://www.defectdojo.org/img/favicon.ico
 maintainers:
   - name: madchap

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "defectdojo",`
`3`		`- "version": "2.15.0",`
	`3`	`+ "version": "2.15.1",`
`4`	`4`	`"license" : "BSD-3-Clause",`
`5`	`5`	`"private": true,`
`6`	`6`	`"dependencies": {`