diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss index cb14c4c..35fc07a 100755 --- a/app/assets/stylesheets/layout.css.scss +++ b/app/assets/stylesheets/layout.css.scss @@ -210,7 +210,7 @@ float:clear; } a.flag-true { color: $color_schema_3_dark} a.flag-true.flag-goodquality-true { color: green} - +a.flag-true.flag-template-true {color: $color_schema_1_dark} a.flag-false { color: #CCC} ul.ui-menu diff --git a/app/controllers/survey/questions_controller.rb b/app/controllers/survey/questions_controller.rb index 9b9d282..4bcf2fc 100644 --- a/app/controllers/survey/questions_controller.rb +++ b/app/controllers/survey/questions_controller.rb @@ -9,6 +9,7 @@ class Survey::QuestionsController < ApplicationController format.html # index.html.erb end end + def answer @survey_question = Survey::Question.find(params[:id]) if (params[:key].nil? || params[:key].empty?) @@ -28,6 +29,11 @@ class Survey::QuestionsController < ApplicationController end # GET /survey/questions/1 # GET /survey/questions/1.json + def create_from_template + @template = Survey::Question.find(params[:id]) + + end + def show @survey_question = Survey::Question.find(params[:id]) diff --git a/app/helpers/survey/questions_helper.rb b/app/helpers/survey/questions_helper.rb index b4d9998..b2757f1 100644 --- a/app/helpers/survey/questions_helper.rb +++ b/app/helpers/survey/questions_helper.rb @@ -1,2 +1,5 @@ module Survey::QuestionsHelper + def new_question_for(obj) + render partial: "survey/questions/new_question", locals: {question_templates: Survey::Question.templates} + end end diff --git a/app/models/survey/question.rb b/app/models/survey/question.rb index 7610ca2..1911f74 100644 --- a/app/models/survey/question.rb +++ b/app/models/survey/question.rb @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- class Survey::Question < ActiveRecord::Base attr_accessible :text, :title, :typ, :choice_ids belongs_to :parent, polymorphic: true @@ -5,10 +6,12 @@ class Survey::Question < ActiveRecord::Base has_many :answers, through: :choices include IsCommentable FLAG_ICONS={"delete" => "fa fa-trash", "template"=> "ffi1-cleaning1"} - FLAG_CONFIRM={} + FLAG_CONFIRM={"delete"=> "Sicher loeschen?"} scope :templates, ->{ where(flag_template:true)} acts_as_flagable - + def attributes_for_copy + self.attributes + end def add_yesno_choices c=Survey::Choice.new(title: "Ja") c.save diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb index da12d98..92d5abc 100644 --- a/app/views/comments/_comment.html.erb +++ b/app/views/comments/_comment.html.erb @@ -14,10 +14,10 @@ <% end %>
-