diff --git a/app/controllers/survey/questions_controller.rb b/app/controllers/survey/questions_controller.rb index e7d18b4..19b6a33 100644 --- a/app/controllers/survey/questions_controller.rb +++ b/app/controllers/survey/questions_controller.rb @@ -9,8 +9,17 @@ class Survey::QuestionsController < ApplicationController end end def answer - @survey_question = Survey::Question.find(params[:id]) - @survey_question.do_answer(params[:survey_question][:selected],current_user) + @survey_question = Survey::Question.find(params[:id]) + if (params[:key].nil? || params[:key].empty?) + user = current_user + else + k=Key.find_by_uuid(params[:key] ) + if k.is_valid && k.typ==3 && k.parent == @survey_question + user = k.user + end + end + + @survey_question.do_answer(params[:survey_question][:selected],user) render :show end # GET /survey/questions/1 diff --git a/app/views/neuigkeiten/show.html.erb b/app/views/neuigkeiten/show.html.erb index cd49339..42cda0b 100755 --- a/app/views/neuigkeiten/show.html.erb +++ b/app/views/neuigkeiten/show.html.erb @@ -34,11 +34,12 @@ <%= link_to "Refresh", neuigkeit_path(@neuigkeit), remote: true %>

<%= notice %>

<%= render partial: "neuigkeit_view", object: @neuigkeit %> - - <% @neuigkeit.questions.each do |q| %> <%= render q%> <% end %> + + +
" data-layout="standard" data-action="like" data-show-faces="true" data-share="true">
<% if can? :find_link , @neuigkeit %> diff --git a/app/views/news_mailer/neuigkeit_mail.html.erb b/app/views/news_mailer/neuigkeit_mail.html.erb index f853f12..5518dd4 100644 --- a/app/views/news_mailer/neuigkeit_mail.html.erb +++ b/app/views/news_mailer/neuigkeit_mail.html.erb @@ -1,5 +1,6 @@ - <%= stylesheet_link_tag "application", :media=>"all" %> + + <%= stylesheet_link_tag "http://"+ActionMailer::Base.default_url_options[:host].to_s + "/assets/themes/blue2/application.css", :media=>"all" %>

<%= @neuigkeit.title%>

@@ -7,4 +8,4 @@ <%=url_for controller: "neuigkeiten",action: :show, :id=>@neuigkeit.id, only_path: false %> <%= raw(@neuigkeit.text) %> <%= render partial:"survey/questions/mail", object: @neuigkeit.questions.first unless @neuigkeit.questions.empty?%> -<%= link_to "Auf Fet.at weiterlesen", rubrik_neuigkeit_url(@neuigkeit.rubrik, @neuigkeit,:locale=>:de, :theme=>nil,:host=> "www.fet.at") %> +<%= link_to "Auf Fet.at weiterlesen", rubrik_neuigkeit_url(@neuigkeit.rubrik, @neuigkeit,:locale=>:de, :theme=>nil) %> diff --git a/app/views/survey/choices/_mail.html.erb b/app/views/survey/choices/_mail.html.erb index 9a91254..82a121c 100644 --- a/app/views/survey/choices/_mail.html.erb +++ b/app/views/survey/choices/_mail.html.erb @@ -7,7 +7,7 @@ if @user.nil? else value=(@user.id.nil?)? false : choice.answers.where(user_id: @user.id).count>0 cstyle=(value) ? "true" :"false" - t= link_to(raw("" + choice.html+ (( choice.picture.nil? || choice.picture.to_s.empty?) ? "":image_tag(choice.picture.thumb.url))), answer_survey_question_url(choice.question, params: {survey_question: {selected: [choice.id]}}),class: "choice-"+cstyle ) + t= link_to(raw("" + choice.html+ (( choice.picture.nil? || choice.picture.to_s.empty?) ? "":image_tag(choice.picture.thumb.url))), answer_survey_question_url(choice.question, params: {key: Key.find_or_create(@user, 3, choice.question).uuid, survey_question: {selected: [choice.id]}}),class: "choice-"+cstyle ) end %> diff --git a/app/views/survey/questions/_question.html.erb b/app/views/survey/questions/_question.html.erb index 9b67ea4..95054b0 100644 --- a/app/views/survey/questions/_question.html.erb +++ b/app/views/survey/questions/_question.html.erb @@ -1,5 +1,5 @@ <% if current_user.nil? %> - <%= render partial: "answeredquestion", object: question %> + <%= render partial: "survey/questions/answeredquestion", object: question %> <% else %>