From 3a4888c9a47d44614610e00ea265400cd26d0648 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Wed, 5 Aug 2015 09:03:03 +0200 Subject: [PATCH] AutoCommit Mit Aug 5 09:03:03 CEST 2015 --- app/models/survey/question.rb | 2 +- app/views/survey/questions/_question.html.erb | 1 + config/routes.rb | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/survey/question.rb b/app/models/survey/question.rb index 36d01e4..1064273 100644 --- a/app/models/survey/question.rb +++ b/app/models/survey/question.rb @@ -4,7 +4,7 @@ class Survey::Question < ActiveRecord::Base has_many :choices, dependent: :destroy has_many :answers, through: :choices include IsCommentable - + FLAG_ICONS={"delete" => "fa fa-trash"} scope :templates, ->{ where(flag_template:true)} def add_yesno_choices diff --git a/app/views/survey/questions/_question.html.erb b/app/views/survey/questions/_question.html.erb index 681b712..0c79021 100644 --- a/app/views/survey/questions/_question.html.erb +++ b/app/views/survey/questions/_question.html.erb @@ -6,6 +6,7 @@
<%= question.title%> <%=question.text%><%= link_to fa_icon("pencil"), edit_survey_question_path(question) , class: "btn btn-link navbar-btn" , remote: true%> + <%= flag_link(question, "delete")%>
    <% question.choices.each do |c| %> diff --git a/config/routes.rb b/config/routes.rb index 0940321..938e6c6 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -15,6 +15,8 @@ member do get :answer put :answer + get 'flag' + end end resources :choices