From 33d70539a6698132a6ee4a798f5b1ce002d4512d Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Mon, 26 Oct 2020 22:09:31 +0100
Subject: [PATCH] Show timezone wherever possible

---
 .../js/pages/homepage/components/PostModal.js        |  4 +++-
 .../pages/homepage/components/postlist/PostItem.js   |  2 +-
 src/newsreader/news/collection/serializers.py        | 12 +++++++++++-
 .../templates/news/collection/views/feed-update.html |  2 +-
 .../collection/tests/endpoints/rule/detail/tests.py  |  1 +
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/newsreader/js/pages/homepage/components/PostModal.js b/src/newsreader/js/pages/homepage/components/PostModal.js
index 5196102..4b5bb10 100644
--- a/src/newsreader/js/pages/homepage/components/PostModal.js
+++ b/src/newsreader/js/pages/homepage/components/PostModal.js
@@ -72,7 +72,9 @@ class PostModal extends React.Component {
           <div className="post__header">
             <h2 className={titleClassName}>{`${post.title} `}</h2>
             <div className="post__meta-info">
-              <span className="post__date">{publicationDate}</span>
+              <span className="post__date">
+                {publicationDate} {this.props.rule.timezone}
+              </span>
               {post.author && <span className="post__author">{post.author}</span>}
               {this.props.category && (
                 <span className="badge post__category" title={this.props.category.name}>
diff --git a/src/newsreader/js/pages/homepage/components/postlist/PostItem.js b/src/newsreader/js/pages/homepage/components/postlist/PostItem.js
index f69a463..b274c81 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 {
 
         <div className="posts-info">
           <span className="posts-info__date" title={publicationDate}>
-            {publicationDate} {post.author && `By ${post.author}`}
+            {publicationDate} {rule.timezone} {post.author && `By ${post.author}`}
           </span>
           {this.props.selected.type == CATEGORY_TYPE && (
             <span className="badge">
diff --git a/src/newsreader/news/collection/serializers.py b/src/newsreader/news/collection/serializers.py
index 04bdba5..dd82330 100644
--- a/src/newsreader/news/collection/serializers.py
+++ b/src/newsreader/news/collection/serializers.py
@@ -12,4 +12,14 @@ class RuleSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = CollectionRule
-        fields = ("id", "type", "name", "url", "favicon", "category", "user", "unread")
+        fields = (
+            "id",
+            "type",
+            "name",
+            "url",
+            "favicon",
+            "category",
+            "user",
+            "unread",
+            "timezone",
+        )
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 33b1faf..46df17d 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" only %}
+    {% include "components/form/form.html" with form=form title="Update feed" cancel_url=cancel_url confirm_text="Save feed" %}
   </main>
 {% 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 8dfe6ed..0e1da3a 100644
--- a/src/newsreader/news/collection/tests/endpoints/rule/detail/tests.py
+++ b/src/newsreader/news/collection/tests/endpoints/rule/detail/tests.py
@@ -30,6 +30,7 @@ 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(