From 2a7ae7c2bfb5da028b25df9544d7925555d3d693 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sat, 1 Aug 2015 21:03:02 +0200 Subject: [PATCH] AutoCommit Sam Aug 1 21:03:02 CEST 2015 --- app/views/survey/choices/new.js.erb | 1 + app/views/survey/questions/_question.html.erb | 22 ++++++++++--------- app/views/survey/questions/show.js.erb | 1 + 3 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 app/views/survey/choices/new.js.erb create mode 100644 app/views/survey/questions/show.js.erb diff --git a/app/views/survey/choices/new.js.erb b/app/views/survey/choices/new.js.erb new file mode 100644 index 0000000..7f019f8 --- /dev/null +++ b/app/views/survey/choices/new.js.erb @@ -0,0 +1 @@ +$('#<%= %>').find('ul.choice-list').append("
  • <%= escape_javascript(render partial: "form", object:@choice) %>
  • ") diff --git a/app/views/survey/questions/_question.html.erb b/app/views/survey/questions/_question.html.erb index 95054b0..8e49c20 100644 --- a/app/views/survey/questions/_question.html.erb +++ b/app/views/survey/questions/_question.html.erb @@ -1,18 +1,20 @@ <% if current_user.nil? %> - <%= render partial: "survey/questions/answeredquestion", object: question %> + <%= div_tag_for(question) do%> +<%= render partial: "survey/questions/answeredquestion", object: question %> + <% end %> <% else %> -
    +
    <%= question.title%> <%=question.text%>
    -
    -
      - <% question.choices.each do |c| %> -
    • <%= render c %>
    • - <% end %> -
    - <%= render partial: "survey/questions/answeredquestion", object: question if question.answers.where(user_id: current_user.id).count>0%> - +
      + <% question.choices.each do |c| %> +
    • <%= render c %>
    • + <% end %> +
    +
    + <%= render partial: "survey/questions/answeredquestion", object: question if question.answers.where(user_id: current_user.id).count>0%> +
    <% end %> diff --git a/app/views/survey/questions/show.js.erb b/app/views/survey/questions/show.js.erb new file mode 100644 index 0000000..f37fef1 --- /dev/null +++ b/app/views/survey/questions/show.js.erb @@ -0,0 +1 @@ +$('#<%= divid_for(@survey_question) %>').replaceWith("<%= escape_javascript(render @survey_question) %>")