Adapt 'show' view for open questions without options

- Prevent creating options for open questions
- Skip rendering the options table when none exist
This commit is contained in:
taitus
2025-08-06 11:54:30 +02:00
parent d3f32978c8
commit b3f8ba819b
6 changed files with 75 additions and 54 deletions

View File

@@ -101,7 +101,7 @@ module Abilities
end
can [:read, :order_options], Poll::Question::Option
can [:create, :update, :destroy], Poll::Question::Option do |option|
can?(:update, option.question)
can?(:update, option.question) && option.question.accepts_options?
end
can :read, Poll::Question::Option::Video
can [:create, :update, :destroy], Poll::Question::Option::Video do |video|

View File

@@ -61,6 +61,10 @@ class Poll::Question < ApplicationRecord
votation_type.nil? || votation_type.unique?
end
def accepts_options?
votation_type.nil? || votation_type.accepts_options?
end
def max_votes
if multiple?
votation_type.max_votes

View File

@@ -9,6 +9,10 @@ class VotationType < ApplicationRecord
validates :questionable_type, inclusion: { in: ->(*) { QUESTIONABLE_TYPES }}
validates :max_votes, presence: true, if: :max_votes_required?
def accepts_options?
!open?
end
private
def max_votes_required?

View File

@@ -46,6 +46,7 @@
</div>
</div>
<% if @question.accepts_options? %>
<div class="clear">
<% if can?(:create, Poll::Question::Option.new(question: @question)) %>
<%= link_to t("admin.questions.show.add_answer"), new_admin_question_option_path(@question),
@@ -100,3 +101,4 @@
<% end %>
</tbody>
</table>
<% end %>

View File

@@ -20,6 +20,8 @@ describe Abilities::Administrator do
let(:future_poll) { create(:poll, :future) }
let(:current_poll_question) { create(:poll_question) }
let(:future_poll_question) { create(:poll_question, poll: future_poll) }
let(:future_poll_question_open) { create(:poll_question_open, poll: future_poll) }
let(:future_poll_question_option_open) { future_poll_question_open.question_options.new }
let(:current_poll_question_option) { create(:poll_question_option) }
let(:future_poll_question_option) { create(:poll_question_option, poll: future_poll) }
let(:current_poll_option_video) { create(:poll_option_video, option: current_poll_question_option) }
@@ -143,6 +145,9 @@ describe Abilities::Administrator do
it { should_not be_able_to(:create, current_poll_question_option) }
it { should_not be_able_to(:update, current_poll_question_option) }
it { should_not be_able_to(:destroy, current_poll_question_option) }
it { should_not be_able_to(:create, future_poll_question_option_open) }
it { should_not be_able_to(:update, future_poll_question_option_open) }
it { should_not be_able_to(:destroy, future_poll_question_option_open) }
it { should be_able_to(:create, future_poll_option_video) }
it { should be_able_to(:update, future_poll_option_video) }

View File

@@ -89,6 +89,8 @@ describe "Admin poll questions", :admin do
expect(page).to have_content "Question with unique answer"
expect(page).to have_content "Unique answer"
expect(page).not_to have_content "Maximum number of votes"
expect(page).to have_link "Add answer"
expect(page).to have_table "Valid answers"
end
scenario "Multiple" do
@@ -106,6 +108,8 @@ describe "Admin poll questions", :admin do
expect(page).to have_content "Question with multiple answers"
expect(page).to have_content "Multiple answers"
expect(page).to have_text "Maximum number of votes 6", normalize_ws: true
expect(page).to have_link "Add answer"
expect(page).to have_table "Valid answers"
end
scenario "Open-ended" do
@@ -122,6 +126,8 @@ describe "Admin poll questions", :admin do
expect(page).to have_content "What do you want?"
expect(page).to have_content "Open-ended"
expect(page).not_to have_content "Maximum number of votes"
expect(page).not_to have_link "Add answer"
expect(page).not_to have_table "Valid answers"
end
end
end