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

removes mentions to enquiries and deprecated code

Browse Source
This commit is contained in:
Juanjo Bazán
2016-12-07 14:48:44 +01:00
parent 9678956f8c
commit 6aa96c4471
8 changed files with 8 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/stylesheets/participation.scss
View File

@@ -1024,16 +1024,6 @@
} }
} }
.enquiries-list {
.enquiry {
background: white;
border-top: 1px solid $border;
padding: $line-height 0;
position: relative;
}
}
.successful { .successful {
.panel { .panel {

41
app/views/enquiries/index.html.erb
View File

@@ -1,41 +0,0 @@
<div class="expanded no-margin-top margin-bottom dark-heading enquiries padding">
<div class="row">
<div class="small-12 medium-6 column">
<h2>
<%= t("enquiries.index.title") %>
</h2>
<p>
<%= t("enquiries.index.description_html").html_safe %>
</p>
</div>
</div>
</div>
<main>
<div class="row">
<div class="small-12 column">
<%= render 'shared/filter_subnav', i18n_namespace: "enquiries.index" %>
<% if @enquiries.present? %>
<div class="enquiries-list">
<% @enquiries.each do |enquiry| %>
<div class="enquiry">
<h3><%= link_to enquiry.title, enquiry %></h3>
<div class="info">
<%= t('enquiries.index.dates',
open_at: l(enquiry.open_at.to_date),
closed_at: l(enquiry.closed_at.to_date)).html_safe %>
</div>
</div>
<% end %>
</div>
<%= paginate @enquiries %>
<% else %>
<div class="callout primary">
<%= t("enquiries.index.no_enquiries_#{@current_filter}") %>
</div>
<% end %>
</div>
</div>
</main>

4
app/views/proposals/_successful_banner.html.erb
View File

@@ -2,8 +2,8 @@
<%= link_to polls_path do %> <%= link_to polls_path do %>
<div class="small-12 column padding"> <div class="small-12 column padding">
<div class="icon-successful"></div> <div class="icon-successful"></div>
<h2><%= t("enquiries.banner.featured_title") %></h2> <h2><%= t("poll_questions.banner.featured_title") %></h2>
<p><%= t("enquiries.banner.info") %></p> <p><%= t("poll_questions.banner.info") %></p>
</div> </div>
<% end %> <% end %>
</div> </div>

2
app/views/proposals/show.html.erb
View File

@@ -110,7 +110,7 @@
</p> </p>
<% if can? :create, Poll::Question %> <% if can? :create, Poll::Question %>
<p class="text-center"> <p class="text-center">
<%= link_to t('poll_questions.create_enquiry'), <%= link_to t('poll_questions.create_question'),
new_admin_question_path(proposal_id: @proposal.id), new_admin_question_path(proposal_id: @proposal.id),
class: "button hollow expanded" %> class: "button hollow expanded" %>
</p> </p>

2
spec/features/admin/poll/questions_spec.rb
View File

@@ -1,6 +1,6 @@
require 'rails_helper' require 'rails_helper'
feature 'Admin enquiries' do feature 'Admin poll questions' do
background do background do
login_as(create(:administrator).user) login_as(create(:administrator).user)

4
spec/features/polls/questions_spec.rb
View File

@@ -2,7 +2,7 @@ require 'rails_helper'
feature 'Poll Questions' do feature 'Poll Questions' do
scenario 'Lists enquiries from proposals before regular enquiries' do scenario 'Lists questions from proposals before regular questions' do
poll = create(:poll) poll = create(:poll)
normal_question = create(:poll_question, poll: poll) normal_question = create(:poll_question, poll: poll)
proposal_question = create(:poll_question, proposal: create(:proposal), poll: poll) proposal_question = create(:poll_question, proposal: create(:proposal), poll: poll)
@@ -42,7 +42,7 @@ feature 'Poll Questions' do
expect(page).to_not have_link('Chewbacca') expect(page).to_not have_link('Chewbacca')
end end
scenario 'Level 2 users in an enquiry for a geozone which is not theirs' do scenario 'Level 2 users in an poll question for a geozone which is not theirs' do
question = create(:poll_question, geozone_ids: [], valid_answers: 'Vader, Palpatine') question = create(:poll_question, geozone_ids: [], valid_answers: 'Vader, Palpatine')
login_as(create(:user, :level_two)) login_as(create(:user, :level_two))

2
spec/features/proposals_spec.rb
View File

@@ -1531,7 +1531,7 @@ feature 'Successful proposals' do
end end
end end
scenario 'Successful proposals show create enquiry button to admin users' do scenario 'Successful proposals show create question button to admin users' do
successful_proposals = create_successful_proposals successful_proposals = create_successful_proposals
visit proposals_path visit proposals_path

2
spec/models/poll/partial_result_spec.rb
View File

@@ -3,7 +3,7 @@ require 'rails_helper'
describe Poll::PartialResult do describe Poll::PartialResult do
describe "validations" do describe "validations" do
it "validates that the answers are included in the Enquiry's list" do it "validates that the answers are included in the Poll::Question's list" do
q = create(:poll_question, valid_answers: 'One, Two, Three') q = create(:poll_question, valid_answers: 'One, Two, Three')
expect(build(:poll_partial_result, question: q, answer: 'One')).to be_valid expect(build(:poll_partial_result, question: q, answer: 'One')).to be_valid
expect(build(:poll_partial_result, question: q, answer: 'Two')).to be_valid expect(build(:poll_partial_result, question: q, answer: 'Two')).to be_valid