chor: add string for poll_page.title and allow backwards date change …

…for global polls
FriendsOfFlarum · Apr 4, 2024 · 2ecda05 · 2ecda05
1 parent 906dd34
commit 2ecda05
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/js/dist/forum.js b/js/dist/forum.js
diff --git a/js/dist/forum.js.map b/js/dist/forum.js.map
diff --git a/js/src/forum/components/PollPageHero.tsx b/js/src/forum/components/PollPageHero.tsx
@@ -10,7 +10,7 @@ interface PollPageHeroAttrs extends ComponentAttrs {
   title?: string;
 }
 
-export default class IndexPageHero extends Component<PollPageHeroAttrs> {
+export default class PollPageHero extends Component<PollPageHeroAttrs> {
   oninit(vnode: Mithril.Vnode) {
     super.oninit(vnode);
   }

diff --git a/resources/locale/en.yml b/resources/locale/en.yml
@@ -47,6 +47,9 @@ fof-polls:
       delete: Delete Poll
       error: There was an error saving the poll, please contact any administrator.
 
+    polls_page:
+      title: Polls
+
     polls_list:
       empty_text: It looks as though there are no community wide polls here.
       load_more_button: Load More

diff --git a/src/Commands/EditPollHandler.php b/src/Commands/EditPollHandler.php
@@ -102,7 +102,7 @@ public function handle(EditPoll $command)
             if (is_string($endDate)) {
                 $date = Carbon::parse($endDate);
 
-                if (!$poll->hasEnded() && $date->isFuture() && ($poll->end_date === null || $poll->end_date->lessThanOrEqualTo($date))) {
+                if (!$poll->hasEnded() && $date->isFuture() && ($poll->isGlobal() || $poll->end_date === null || $poll->end_date->lessThanOrEqualTo($date))) {
                     $poll->end_date = $date->utc();
                 }
             } elseif (is_bool($endDate) && !$endDate) {