diff --git a/src/newsreader/js/pages/homepage/components/PostModal.js b/src/newsreader/js/pages/homepage/components/PostModal.js index 4b5bb10..5196102 100644 --- a/src/newsreader/js/pages/homepage/components/PostModal.js +++ b/src/newsreader/js/pages/homepage/components/PostModal.js @@ -72,9 +72,7 @@ class PostModal extends React.Component {

{`${post.title} `}

- - {publicationDate} {this.props.rule.timezone} - + {publicationDate} {post.author && {post.author}} {this.props.category && ( diff --git a/src/newsreader/js/pages/homepage/components/postlist/PostItem.js b/src/newsreader/js/pages/homepage/components/postlist/PostItem.js index b274c81..f69a463 100644 --- a/src/newsreader/js/pages/homepage/components/postlist/PostItem.js +++ b/src/newsreader/js/pages/homepage/components/postlist/PostItem.js @@ -41,7 +41,7 @@ class PostItem extends React.Component {
- {publicationDate} {rule.timezone} {post.author && `By ${post.author}`} + {publicationDate} {post.author && `By ${post.author}`} {this.props.selected.type == CATEGORY_TYPE && ( diff --git a/src/newsreader/news/collection/serializers.py b/src/newsreader/news/collection/serializers.py index dd82330..04bdba5 100644 --- a/src/newsreader/news/collection/serializers.py +++ b/src/newsreader/news/collection/serializers.py @@ -12,14 +12,4 @@ class RuleSerializer(serializers.ModelSerializer): class Meta: model = CollectionRule - fields = ( - "id", - "type", - "name", - "url", - "favicon", - "category", - "user", - "unread", - "timezone", - ) + fields = ("id", "type", "name", "url", "favicon", "category", "user", "unread") diff --git a/src/newsreader/news/collection/templates/news/collection/views/feed-update.html b/src/newsreader/news/collection/templates/news/collection/views/feed-update.html index 46df17d..33b1faf 100644 --- a/src/newsreader/news/collection/templates/news/collection/views/feed-update.html +++ b/src/newsreader/news/collection/templates/news/collection/views/feed-update.html @@ -9,6 +9,6 @@ {% endif %} {% url "news:collection:rules" as cancel_url %} - {% include "components/form/form.html" with form=form title="Update feed" cancel_url=cancel_url confirm_text="Save feed" %} + {% include "components/form/form.html" with form=form title="Update feed" cancel_url=cancel_url confirm_text="Save feed" only %} {% endblock %} diff --git a/src/newsreader/news/collection/tests/endpoints/rule/detail/tests.py b/src/newsreader/news/collection/tests/endpoints/rule/detail/tests.py index 0e1da3a..8dfe6ed 100644 --- a/src/newsreader/news/collection/tests/endpoints/rule/detail/tests.py +++ b/src/newsreader/news/collection/tests/endpoints/rule/detail/tests.py @@ -30,7 +30,6 @@ class CollectionRuleDetailViewTestCase(TestCase): self.assertTrue("favicon" in data) self.assertTrue("category" in data) self.assertTrue("type" in data) - self.assertTrue("timezone" in data) def test_not_known(self): response = self.client.get(