new ui for faq and announcement status fixed.

This commit is contained in:
harrybomrah authored and saurabhbhatia committed 2013-08-20 18:22:11 +08:00
1 parent 21a7b5da5c
commit 897ed49d2e
26 files changed
+369 -632

No files matched your search

@@ -1,104 +0,0 @@
class Panel::Faq::BackEnd::QaCategorysController < OrbitBackendController
before_filter :for_app_manager,:except => [:index]
include OrbitControllerLib::DivisionForDisable
def index
@qa_categorys = get_categories_for_index("QaCategory")
@qa_category = QaCategory.new(:display => 'List')
@url = panel_faq_back_end_qa_categorys_path
respond_to do |format|
format.html # index.html.erb
format.js
end
end
# GET /qas/1
# GET /qas/1.xml
def show
@qa_category = QaCategory.find(params[:id])
respond_to do |format|
format.html # show.html.erb
format.js
end
end
# GET /qas/new
# GET /qas/new.xml
def new
@qa_category = QaCategory.new(:display => 'List')
respond_to do |format|
format.html # new.html.erb
format.js
end
end
# GET /qas/1/edit
def edit
@qa_category = QaCategory.find(params[:id])
@url = panel_faq_back_end_qa_category_path(@qa_category)
respond_to do |format|
format.html
format.js
end
end
# POST /qas
# POST /qas.xml
def create
@qa_category = QaCategory.new(params[:qa_category])
respond_to do |format|
if @qa_category.save
format.html { redirect_to(panel_faq_back_end_qa_categorys_url, :notice => t('qa.create_qa_category_success')) }
format.js
else
format.html { render :action => "new" }
format.js { render action: "new" }
end
end
end
# PUT /qas/1
# PUT /qas/1.xml
def update
@qa_category = QaCategory.find(params[:id])
@url = panel_faq_back_end_qa_category_path(@qa_category)
respond_to do |format|
if @qa_category.update_attributes(params[:qa_category])
format.html { redirect_to(panel_faq_back_end_qa_categorys_url, :notice => t('qa.update_qa_category_success')) }
# format.xml { head :ok }
format.js
else
format.html { render :action => "edit" }
format.js { render :action => "edit" }
end
end
end
# DELETE /qas/1
# DELETE /qas/1.xml
def destroy
@qa_category = QaCategory.find(params[:id])
@qa_category.disable = @qa_category.disable ? false : true
if @qa_category.save!
respond_to do |format|
format.html { redirect_to(panel_faq_back_end_qa_categorys_url) }
# format.xml { head :ok }
format.js
end
else
flash[:error] = t("update.fail")
format.html { render :action => "index" }
end
end
end
@@ -1,44 +1,24 @@
class Panel::Faq::BackEnd::QasController < OrbitBackendController
# before_filter :for_app_manager,:except => [:index,:show]
include AdminHelper
include OrbitControllerLib::DivisionForDisable
# include OrbitControllerLib::DivisionForDisable
before_filter :force_order_for_visitor,:only=>[:index]
before_filter :force_order_for_user,:except => [:index]
before_filter :for_app_sub_manager,:except => [:index]
before_filter :only => [ :new,:edit,:update,:create] do |controller|
controller.get_categorys('QaCategory')
before_filter :only => [ :new, :create, :edit, :update ] do |controller|
@categories = get_categories_for_form
end
def index
get_categorys("QaCategory",params[:qa_category_id])
@filter = params[:filter]
new_filter = params[:new_filter]
if @filter && params[:clear]
@filter.delete(params[:type])
elsif @filter && new_filter
if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s)
@filter[new_filter[:type]].delete(new_filter[:id].to_s)
elsif @filter.has_key?(new_filter[:type])
@filter[new_filter[:type]] << new_filter[:id].to_s
else
@filter.merge!({new_filter[:type] => [new_filter[:id].to_s]})
end
elsif new_filter
@filter = {new_filter[:type] => [new_filter[:id].to_s]}
end
@qa_categories = get_categories_for_index("QaCategory")
@qa_category_ids = @qa_categories.collect{|t| t.id.to_s} + [nil]
# @qas = Qa.search(params[:category_id])
#@qas = (params[:sort] || @filter) ? get_sorted_and_filtered_qas : Qa.all.page(params[:page]).per(10)
@qas = (params[:sort] || @filter) ? get_sorted_and_filtered("qa",:qa_category_id.in => @qa_category_ids) : get_viewable("qa",:qa_category_id.in => @qa_category_ids)
@all_qas = @qas.page params[:page]
@tags = get_tags
@categories = get_categories_for_index
@statuses = get_statuses
category_ids = @categories.collect{|t| t.id}
@qas = get_sorted_and_filtered("qa", :category_id.in => category_ids)
respond_to do |format|
format.html # index.html.erb
format.xml { render :xml => @qas }
@@ -61,7 +41,7 @@ class Panel::Faq::BackEnd::QasController < OrbitBackendController
def new
@qa = Qa.new
@tags = get_tags
@statuses = get_statuses
respond_to do |format|
format.html # new.html.erb
format.xml { render :xml => @qa }
@@ -71,7 +51,8 @@ class Panel::Faq::BackEnd::QasController < OrbitBackendController
# GET /qas/1/edit
def edit
@qa = Qa.find(params[:id])
@tags = get_tags
@statuses = get_statuses
@tags = get_tags
end
# POST /qas
@@ -97,15 +78,13 @@ class Panel::Faq::BackEnd::QasController < OrbitBackendController
# PUT /qas/1.xml
def update
@qa = Qa.find(params[:id])
@qa.update_user_id = current_user.id
params[:qa][:tag_ids] ||=[]
respond_to do |format|
if @qa.update_attributes(params[:qa])
format.html { redirect_to(panel_faq_back_end_qas_url(:page => params[:page])) }
format.js { render 'toggle_enable' }
format.html { redirect_to(panel_faq_back_end_qas_path) }
format.js { render 'toggle_enable' }
format.xml { head :ok }
else
format.html { render :action => "edit" }