Removed question description
This commit is contained in:
@@ -56,7 +56,7 @@ class Admin::Poll::QuestionsController < Admin::Poll::BaseController
|
|||||||
private
|
private
|
||||||
|
|
||||||
def question_params
|
def question_params
|
||||||
params.require(:poll_question).permit(:poll_id, :title, :question, :description, :proposal_id, :valid_answers, :video_url,
|
params.require(:poll_question).permit(:poll_id, :title, :question, :proposal_id, :valid_answers, :video_url,
|
||||||
documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy])
|
documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ class Poll::Question < ActiveRecord::Base
|
|||||||
validates :poll_id, presence: true
|
validates :poll_id, presence: true
|
||||||
|
|
||||||
validates :title, length: { minimum: 4 }
|
validates :title, length: { minimum: 4 }
|
||||||
validates :description, length: { maximum: Poll::Question.description_max_length }
|
|
||||||
|
|
||||||
scope :by_poll_id, ->(poll_id) { where(poll_id: poll_id) }
|
scope :by_poll_id, ->(poll_id) { where(poll_id: poll_id) }
|
||||||
|
|
||||||
@@ -40,15 +39,10 @@ class Poll::Question < ActiveRecord::Base
|
|||||||
def searchable_values
|
def searchable_values
|
||||||
{ title => 'A',
|
{ title => 'A',
|
||||||
proposal.try(:title) => 'A',
|
proposal.try(:title) => 'A',
|
||||||
description => 'B',
|
|
||||||
author.username => 'C',
|
author.username => 'C',
|
||||||
author_visible_name => 'C' }
|
author_visible_name => 'C' }
|
||||||
end
|
end
|
||||||
|
|
||||||
def description
|
|
||||||
super.try :html_safe
|
|
||||||
end
|
|
||||||
|
|
||||||
def valid_answers
|
def valid_answers
|
||||||
(super.try(:split, ',').compact || []).map(&:strip)
|
(super.try(:split, ',').compact || []).map(&:strip)
|
||||||
end
|
end
|
||||||
@@ -59,7 +53,6 @@ class Poll::Question < ActiveRecord::Base
|
|||||||
self.author_visible_name = proposal.author.name
|
self.author_visible_name = proposal.author.name
|
||||||
self.proposal_id = proposal.id
|
self.proposal_id = proposal.id
|
||||||
self.title = proposal.title
|
self.title = proposal.title
|
||||||
self.description = proposal.description
|
|
||||||
self.valid_answers = I18n.t('poll_questions.default_valid_answers')
|
self.valid_answers = I18n.t('poll_questions.default_valid_answers')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -20,12 +20,6 @@
|
|||||||
<p class="help-text" id="valid-answers-help-text"><%= t("admin.questions.new.valid_answers_note") %></p>
|
<p class="help-text" id="valid-answers-help-text"><%= t("admin.questions.new.valid_answers_note") %></p>
|
||||||
<%= f.text_field :valid_answers, label: false, aria: {describedby: "valid-answers-help-text"} %>
|
<%= f.text_field :valid_answers, label: false, aria: {describedby: "valid-answers-help-text"} %>
|
||||||
|
|
||||||
<div class="ckeditor">
|
|
||||||
<%= f.cktext_area :description,
|
|
||||||
maxlength: Poll::Question.description_max_length,
|
|
||||||
ckeditor: { language: I18n.locale } %>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="documents small-12">
|
<div class="documents small-12">
|
||||||
<%= render 'documents/nested_documents', documentable: @question, f: f %>
|
<%= render 'documents/nested_documents', documentable: @question, f: f %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
class RemoveDescriptionFromPollQuestions < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
remove_column :poll_questions, :description
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(version: 20171003095936) do
|
ActiveRecord::Schema.define(version: 20171003170029) do
|
||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
@@ -675,7 +675,6 @@ ActiveRecord::Schema.define(version: 20171003095936) do
|
|||||||
t.string "author_visible_name"
|
t.string "author_visible_name"
|
||||||
t.string "title"
|
t.string "title"
|
||||||
t.string "valid_answers"
|
t.string "valid_answers"
|
||||||
t.text "description"
|
|
||||||
t.integer "comments_count"
|
t.integer "comments_count"
|
||||||
t.datetime "hidden_at"
|
t.datetime "hidden_at"
|
||||||
t.datetime "created_at"
|
t.datetime "created_at"
|
||||||
|
|||||||
Reference in New Issue
Block a user