Skip to content

Commit 170e823

Browse files
Merge pull request #3257 from antgonza/fix-email-url
fix email url
2 parents 5645820 + fc4a39f commit 170e823

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

qiita_db/processing_job.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -775,15 +775,15 @@ def _generate_notification_message(self, value, error_msg):
775775
data_type = data_types.pop()
776776

777777
message = f'Processing Job: {self.command.name}\n'
778-
message += f'{qiita_config.base_url}study/'
778+
message += f'{qiita_config.base_url}/study/'
779779
message += f'description/{study_id}\n'
780780
message += f'Prep IDs: {prep_ids}\n'
781781
message += f'Data Type: {data_type}\n'
782782
elif artifact.analysis:
783783
# this is an analysis job. display analysis id as link and
784784
# the command name.
785785
message = f'Analysis Job {self.command.name}\n'
786-
message += f'{qiita_config.base_url}analysis/'
786+
message += f'{qiita_config.base_url}/analysis/'
787787
message += f'description/{artifact.analysis.id}/\n'
788788
else:
789789
raise qdb.exceptions.QiitaError("Unknown Condition")

qiita_db/test/test_processing_job.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ def test_notification_mail_generation(self):
873873
exp = {'subject': ('Job status change: Split libraries FASTQ '
874874
'(063e553b-327c-4818-ab4a-adfe58e49860)'),
875875
'message': ('Processing Job: Split libraries FASTQ\n'
876-
f'{qiita_config.base_url}study/description/1'
876+
f'{qiita_config.base_url}/study/description/1'
877877
'\nPrep IDs: 1\nData Type: 18S\nNew '
878878
'status: error')}
879879
self.assertDictEqual(obs, exp)
@@ -883,7 +883,7 @@ def test_notification_mail_generation(self):
883883
exp = {'subject': ('Job status change: Split libraries FASTQ '
884884
'(063e553b-327c-4818-ab4a-adfe58e49860)'),
885885
'message': ('Processing Job: Split libraries FASTQ\n'
886-
f'{qiita_config.base_url}study/description/1\n'
886+
f'{qiita_config.base_url}/study/description/1\n'
887887
'Prep IDs: 1\nData Type: 18S\nNew status'
888888
': error\n\nError:\nAn Error Message')}
889889
self.assertDictEqual(obs, exp)
@@ -894,7 +894,7 @@ def test_notification_mail_generation(self):
894894
exp = {'subject': ('Job status change: Split libraries FASTQ '
895895
'(063e553b-327c-4818-ab4a-adfe58e49860)'),
896896
'message': ('Processing Job: Split libraries FASTQ\n'
897-
f'{qiita_config.base_url}study/description/1\n'
897+
f'{qiita_config.base_url}/study/description/1\n'
898898
'Prep IDs: 1\nData Type: 18S\nNew status'
899899
': running')}
900900
self.assertDictEqual(obs, exp)
@@ -903,7 +903,7 @@ def test_notification_mail_generation(self):
903903
exp = {'subject': ('Job status change: Split libraries FASTQ '
904904
'(063e553b-327c-4818-ab4a-adfe58e49860)'),
905905
'message': ('Processing Job: Split libraries FASTQ\n'
906-
f'{qiita_config.base_url}study/description/1\n'
906+
f'{qiita_config.base_url}/study/description/1\n'
907907
'Prep IDs: 1\nData Type: 18S\nNew status'
908908
': running')}
909909
self.assertDictEqual(obs, exp)
@@ -915,7 +915,7 @@ def test_notification_mail_generation(self):
915915
exp = {'subject': 'Job status change: Single Rarefaction '
916916
'(8a7a8461-e8a1-4b4e-a428-1bc2f4d3ebd0)',
917917
'message': 'Analysis Job Single Rarefaction\n'
918-
f'{qiita_config.base_url}analysis/description/1/\n'
918+
f'{qiita_config.base_url}/analysis/description/1/\n'
919919
'New status: running'}
920920
self.assertDictEqual(obs, exp)
921921

0 commit comments

Comments
 (0)