diff --git a/app/models/poll.rb b/app/models/poll.rb
index caa374dc8..1bd3d07ef 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -1,6 +1,7 @@
class Poll < ActiveRecord::Base
has_many :booths
has_many :voters, through: :booths, class_name: "Poll::Voter"
+ has_many :officers, through: :booths, class_name: "Poll::Officer"
has_many :questions
validates :name, presence: true
diff --git a/app/views/admin/poll/polls/_booths.html.erb b/app/views/admin/poll/polls/_booths.html.erb
new file mode 100644
index 000000000..ba62bc032
--- /dev/null
+++ b/app/views/admin/poll/polls/_booths.html.erb
@@ -0,0 +1,26 @@
+
+
+ <%= link_to "AƱadir pregunta",
+ new_admin_question_path(poll_id: @poll.id),
+ class: "button success" %>
+
+ <% if @poll.questions.count == 0 %>
+
+ <%= t('admin.questions.index.no_questions') %>
+
+ <% else %>
+
+ <% @poll.questions.each do |question| %>
+
+ | <%= link_to question.title, admin_question_path(question) %> |
+
+ <%= link_to t('shared.edit'),
+ edit_admin_question_path(question),
+ class: "button hollow" %>
+ <%= link_to t('shared.delete'),
+ admin_question_path(question),
+ class: "button hollow alert",
+ method: :delete %>
+ |
+
+ <% end %>
+
+ <% end %>
+
\ No newline at end of file
diff --git a/app/views/admin/poll/polls/show.html.erb b/app/views/admin/poll/polls/show.html.erb
index bed01af41..5317b1f0a 100644
--- a/app/views/admin/poll/polls/show.html.erb
+++ b/app/views/admin/poll/polls/show.html.erb
@@ -9,28 +9,18 @@
edit_admin_poll_path(@poll),
class: "button hollow float-right" %>
-<%= link_to t("admin.polls.show.add_booth"),
- new_admin_poll_booth_path(@poll),
- class: "button success" %>
+
+ <%= render "filter_subnav" %>
-<% if @poll.booths.empty? %>
-
- <%= t("admin.polls.show.no_booths") %>
+
+ <%= render "questions" %>
-<% else %>
-
<%= t("admin.polls.show.booths_title") %>
-
-
- | <%= t("admin.polls.show.name") %> |
- <%= t("admin.polls.show.location") %> |
- <%= t("admin.polls.show.officers") %> |
- |
-
-
- <% @poll.booths.each do |booth| %>
- <%= render partial: "admin/poll/booths/booth", locals: { booth: booth } %>
- <% end %>
-
-
-<% end %>
\ No newline at end of file
+
+ <%= render "booths" %>
+
+
+
+ <%= render 'officers' %>
+
+
\ No newline at end of file