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

Merge branch 'suggest_before_creating'

Browse Source 
Conflicts:
	app/assets/javascripts/application.js
	app/controllers/debates_controller.rb
	app/controllers/proposals_controller.rb
	config/locales/es.yml
	config/routes.rb
	db/schema.rb
	spec/features/debates_spec.rb
	spec/features/proposals_spec.rb
This commit is contained in:
MaiteHdezRivas
2016-01-27 13:11:23 +01:00
parent 4b1430c9d6 7406904c51
commit 5dd4633d6a
16 changed files with 198 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/proposals/_form.html.erb
View File

@@ -4,8 +4,9 @@
<div class="row">
<div class="small-12 column">
<%= f.label :title, t("proposals.form.proposal_title") %>
<%= f.text_field :title, maxlength: Proposal.title_max_length, placeholder: t("proposals.form.proposal_title"), label: false %>
<%= f.text_field :title, maxlength: Proposal.title_max_length, placeholder: t("proposals.form.proposal_title"), label: false, data: {ajax_target: "ajax_suggest", ajax_show: "#ajax_suggest_show", ajax_url: suggest_proposals_path}%>
</div>
<div id="ajax_suggest_show"></div>
<div class="small-12 column">
<%= f.label :question, t("proposals.form.proposal_question") %>