Skip to content

Commit

Permalink
Merge pull request #2421 from wiltso/fix-emailtemplate-settings-view
Browse files Browse the repository at this point in the history
Fix EmailTemplate settings page
  • Loading branch information
chessbr committed Mar 18, 2021
2 parents ad55a30 + 838660d commit 9f8ba65
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Expand Up @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

List all changes after the last release here (newer on top). Each change on a separate bullet point line

### Fixed

- Notify: Fix so there is no 500 error when accessing EmailTemplate settings page

### Added

- Core: add attribute in Carrier model to control whether to manage shipments using default behavior
Expand Down
1 change: 1 addition & 0 deletions shuup/notify/admin_module/views/email_template.py
Expand Up @@ -56,6 +56,7 @@ def post(self, request, *args, **kwargs):

class EmailTemplateListView(PicotableListView):
model = EmailTemplate
url_identifier = "notify.email_template"
default_columns = [
Column(
"name",
Expand Down

0 comments on commit 9f8ba65

Please sign in to comment.