consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show always poll officer menu to officers

Browse Source 
Since the change on commit cbbe188d6 we added a Poll.current.any?
condition to show the officing link on admin menu to officers.

That condition doesn't have much sense since Poll results only can be
added after a poll has ended, and there may be only one active poll.
This commit is contained in:
decabeza
2022-10-25 15:25:57 +02:00
committed by Javi Martín
parent 2e9c4de061
commit 1ff2144830
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/layout/admin_login_items_component.rb
View File

@@ -18,7 +18,7 @@ class Layout::AdminLoginItemsComponent < ApplicationComponent
(moderation_link if user.administrator? || user.moderator?), (moderation_link if user.administrator? || user.moderator?),
(valuation_link if feature?(:budgets) && (user.administrator? || user.valuator?)), (valuation_link if feature?(:budgets) && (user.administrator? || user.valuator?)),
(management_link if user.administrator? || user.manager?), (management_link if user.administrator? || user.manager?),
(officing_link if user.poll_officer? && Poll.current.any?), (officing_link if user.poll_officer?),
(sdg_management_link if feature?(:sdg) && (user.administrator? || user.sdg_manager?)) (sdg_management_link if feature?(:sdg) && (user.administrator? || user.sdg_manager?))
] ]
end end

2
spec/components/layout/admin_login_items_component_spec.rb
View File

@@ -102,7 +102,7 @@ describe Layout::AdminLoginItemsComponent do
end end
it "shows the officing link to poll officers" do it "shows the officing link to poll officers" do
user = create(:poll_officer, polls: [create(:poll)]).user user = create(:poll_officer).user
render_inline Layout::AdminLoginItemsComponent.new(user) render_inline Layout::AdminLoginItemsComponent.new(user)

3
spec/system/officing_spec.rb
View File

@@ -61,7 +61,6 @@ describe "Poll Officing" do
scenario "Access as an administrator is not authorized" do scenario "Access as an administrator is not authorized" do
create(:administrator, user: user) create(:administrator, user: user)
create(:poll)
login_as(user) login_as(user)
visit officing_root_path visit officing_root_path
@@ -74,7 +73,6 @@ describe "Poll Officing" do
scenario "Access as an administrator with poll officer role is authorized" do scenario "Access as an administrator with poll officer role is authorized" do
create(:administrator, user: user) create(:administrator, user: user)
create(:poll_officer, user: user) create(:poll_officer, user: user)
create(:poll)
login_as(user) login_as(user)
visit root_path visit root_path
@@ -87,7 +85,6 @@ describe "Poll Officing" do
scenario "Access as a poll officer is authorized" do scenario "Access as a poll officer is authorized" do
create(:poll_officer, user: user) create(:poll_officer, user: user)
create(:poll)
login_as(user) login_as(user)
visit root_path visit root_path