From 96a612af50787e0de329133d3e1c1c75ab9e5322 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 18 Jun 2014 14:41:43 +0800 Subject: [PATCH] added scope and few mods in controller --- app/controllers/faqs_controller.rb | 7 ++++--- app/models/qa.rb | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/faqs_controller.rb b/app/controllers/faqs_controller.rb index 3b8e3cd..7a4c359 100644 --- a/app/controllers/faqs_controller.rb +++ b/app/controllers/faqs_controller.rb @@ -1,6 +1,7 @@ class FaqsController < ApplicationController def index - faqs = Qa.can_display.order_by(:created_at=>'desc').filter_by_categories.collect do |qa| + faqs = Qa.can_display.order_by(:created_at=>'desc').filter_by_categories + f = faqs.collect do |qa| statuses = qa.statuses.collect do |status| { "status" => status, @@ -14,8 +15,8 @@ class FaqsController < ApplicationController } end { - "data" => faqs, - "extras" => {"widget-title"=>"Faqs"} + "data" => f, + "extras" => {"widget-title"=>"Faqs"}, "total_pages" => faqs.total_pages } end diff --git a/app/models/qa.rb b/app/models/qa.rb index 3bd7267..52a417c 100644 --- a/app/models/qa.rb +++ b/app/models/qa.rb @@ -22,6 +22,9 @@ class Qa accepts_nested_attributes_for :qa_files, :allow_destroy => true accepts_nested_attributes_for :qa_links, :allow_destroy => true + + scope :can_display, ->{where(:is_hidden=>false).order_by([:is_top, :desc])} + # belongs_to :qa_category