Skip to content

Commit 38bc25a

Browse files
committed
fix for minor e.text error, minor grammar issue
1 parent 4651334 commit 38bc25a

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

dojo/fixtures/dojo_testdata.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2158,8 +2158,8 @@
21582158
"fields": {
21592159
"configuration_name": "Happy little JIRA 2",
21602160
"url": "https://defectdojo.atlassian.net/",
2161-
"username": "YOUR USERNAME",
2162-
"password": "YOU API TOKEN",
2161+
"username": "[YOUR USERNAME]",
2162+
"password": "[YOUR API TOKEN]",
21632163
"default_issue_type": "Task",
21642164
"epic_name_id": 10011,
21652165
"open_status_key": 11,
@@ -2253,7 +2253,7 @@
22532253
"component": "",
22542254
"enable_engagement_epic_mapping": true,
22552255
"jira_instance": 2,
2256-
"project_key": "key1"
2256+
"project_key": "NTEST"
22572257
}
22582258
},
22592259
{

dojo/jira_link/helper.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,14 +785,15 @@ def failure_to_add_message(message: str, exception: Exception, object: Any) -> b
785785
JIRAError.log_to_tempfile = False
786786
jira = get_jira_connection(jira_instance)
787787
except Exception as e:
788-
message = f"The following jira instance could not be connected: {jira_instance} - {e.text}"
788+
message = f"The following jira instance could not be connected: {jira_instance} - {e}"
789789
return failure_to_add_message(message, e, obj)
790790
# Set the list of labels to set on the jira issue
791791
labels = get_labels(obj) + get_tags(obj)
792792
if labels:
793793
labels = list(dict.fromkeys(labels)) # de-dup
794794
# Determine what due date to set on the jira issue
795795
duedate = None
796+
796797
if System_Settings.objects.get().enable_finding_sla:
797798
duedate = obj.sla_deadline()
798799
# Set the fields that will compose the jira issue
@@ -1104,6 +1105,7 @@ def get_issuetype_fields(
11041105

11051106
issuetype_fields = None
11061107
use_cloud_api = jira.deploymentType.lower() == "cloud" or jira._version < (9, 0, 0)
1108+
11071109
try:
11081110
if use_cloud_api:
11091111
try:

0 commit comments

Comments
 (0)