notifications: properly inject the custom email headers into templates.
dan -
r4461:2b31e8f8 stable
Not Reviewed
Show More
Add another comment
TODOs: 0 unresolved 0 Resolved
COMMENTS: 0 General 0 Inline
@@ -644,7 +644,7 def load_rcextensions(root_path):
644 rcextensions = None
644 rcextensions = None
645
645
646 if rcextensions:
646 if rcextensions:
647 log.debug('Found rcextensions module loaded %s...', rcextensions)
647 log.info('Loaded rcextensions from %s...', rcextensions)
648 rhodecode.EXTENSIONS = rcextensions
648 rhodecode.EXTENSIONS = rcextensions
649
649
650 # Additional mappings that are not present in the pygments lexers
650 # Additional mappings that are not present in the pygments lexers
@@ -384,7 +384,15 class EmailNotificationModel(BaseModel):
384 instance_url = h.route_url('home')
384 instance_url = h.route_url('home')
385 _kwargs = {
385 _kwargs = {
386 'instance_url': instance_url,
386 'instance_url': instance_url,
387 'whitespace_filter': self.whitespace_filter
387 'whitespace_filter': self.whitespace_filter,
388 'email_pr_update_subject_template': EMAIL_PR_UPDATE_SUBJECT_TEMPLATE,
389 'email_pr_review_subject_template': EMAIL_PR_REVIEW_SUBJECT_TEMPLATE,
390 'email_pr_comment_subject_template': EMAIL_PR_COMMENT_SUBJECT_TEMPLATE,
391 'email_pr_comment_status_change_subject_template': EMAIL_PR_COMMENT_STATUS_CHANGE_SUBJECT_TEMPLATE,
392 'email_pr_comment_file_subject_template': EMAIL_PR_COMMENT_FILE_SUBJECT_TEMPLATE,
393 'email_comment_subject_template': EMAIL_COMMENT_SUBJECT_TEMPLATE,
394 'email_comment_status_change_subject_template': EMAIL_COMMENT_STATUS_CHANGE_SUBJECT_TEMPLATE,
395 'email_comment_file_subject_template': EMAIL_COMMENT_FILE_SUBJECT_TEMPLATE,
388 }
396 }
389 _kwargs.update(kwargs)
397 _kwargs.update(kwargs)
390 return _kwargs
398 return _kwargs
Comments 0
You need to be logged in to leave comments. Login now