From 449f6bfc9dd5fcaedcda6f74ad3dbf31dd22107f Mon Sep 17 00:00:00 2001 From: Olivier PEREZ Date: Sat, 5 Mar 2016 16:17:18 +0100 Subject: [PATCH 1/4] Date poll - Don't display vote form when not granted --- tpl/part/vote_table_date.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl index 810f5c1..626b4e1 100644 --- a/tpl/part/vote_table_date.tpl +++ b/tpl/part/vote_table_date.tpl @@ -179,7 +179,7 @@ {* Line to add a new vote *} - {if $active && $editingVoteId === 0 && !$expired} + {if $active && $editingVoteId === 0 && !$expired && $accessGranted}
From 67ed7977d6cb8cc15670cb9c88e25abf8735cba4 Mon Sep 17 00:00:00 2001 From: Olivier PEREZ Date: Sat, 5 Mar 2016 16:17:49 +0100 Subject: [PATCH 2/4] Classical poll - Add missing check of $expired --- tpl/part/vote_table_classic.tpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl index 9385f9e..0c88b78 100644 --- a/tpl/part/vote_table_classic.tpl +++ b/tpl/part/vote_table_classic.tpl @@ -44,8 +44,9 @@ {foreach $votes as $vote} + {* Edited line *} - {if $editingVoteId === $vote->uniqId} {* Edited line *} + {if $editingVoteId === $vote->uniqId && !$expired} From 6481de434746d8616853615330ac41a305acbcf7 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 5 Mar 2016 16:27:26 +0100 Subject: [PATCH 3/4] Fix #143 - Apply the patch of Julien Lepiller --- js/app/date_poll.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/app/date_poll.js b/js/app/date_poll.js index a570ce4..b218ccf 100644 --- a/js/app/date_poll.js +++ b/js/app/date_poll.js @@ -80,7 +80,6 @@ $(document).ready(function () { $(this).find('.hours:eq(' + i + ')').val(first_day_hours[i]); // fill hours } }); - $('#d0-h0').focus(); }); // Buttons "Add an hour" From aec2f049655c40aeba18ff7f00ffebaab3a81f16 Mon Sep 17 00:00:00 2001 From: Pierre Goifon <> Date: Sat, 5 Mar 2016 16:35:13 +0100 Subject: [PATCH 4/4] Fixes #140 - Auto-select url fields when user clicks in it (cherry picked from commit e7064ed70cf910220927c471a8c3839fa36cd475) --- tpl/part/poll_info.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tpl/part/poll_info.tpl b/tpl/part/poll_info.tpl index ec77e4e..e2e4607 100644 --- a/tpl/part/poll_info.tpl +++ b/tpl/part/poll_info.tpl @@ -93,12 +93,12 @@