Adjust for module authorized feature.(sub_managers)
This commit is contained in:
1 parent
ec1ff2051a
commit
ee94cdec5a
6 files changed
+72
-24
No files matched your search
@@ -1,6 +1,7 @@
|
||||
# encoding: utf-8
|
||||
class Admin::AsksController < OrbitAdminController
|
||||
helper Admin::AsksHelper
|
||||
include Admin::AsksHelper
|
||||
before_action ->(module_app = @app_title) { set_variables module_app }
|
||||
before_action :set_askquestion, only: [:edit, :destroy, :update, :print]
|
||||
layout :compute_layout
|
||||
@@ -16,13 +17,26 @@ class Admin::AsksController < OrbitAdminController
|
||||
@app_title = "ask"
|
||||
end
|
||||
def print_setting
|
||||
@set = AskPrintSetting.first
|
||||
@set = nil
|
||||
@cats_relations = get_categories_info
|
||||
@category_id = (params[:category] || @cats_relations[0][0] rescue nil)
|
||||
if @category_id.blank?
|
||||
@set = AskPrintSetting.first
|
||||
else
|
||||
@set = AskCategoryPrintSetting.where(:category_id=>@category_id).first
|
||||
@set = AskPrintSetting.first if @set.nil?
|
||||
end
|
||||
@set = AskPrintSetting.create if @set.nil?
|
||||
@url = print_setting_save_admin_asks_path
|
||||
end
|
||||
def print_setting_save
|
||||
locale = I18n.locale
|
||||
set = AskPrintSetting.first
|
||||
if params[:ask_print_setting][:category_id].present?
|
||||
set = AskCategoryPrintSetting.where(:category_id=>params[:ask_print_setting][:category_id]).first
|
||||
set = AskCategoryPrintSetting.create(:category_id=>params[:ask_print_setting][:category_id]) if set.nil?
|
||||
else
|
||||
set = AskPrintSetting.first
|
||||
end
|
||||
set.update_attributes(print_format: params[:ask_print_setting][:print_format],save_name: params[:ask_print_setting][:save_name])
|
||||
redirect_to "/#{locale}/admin/asks"
|
||||
end
|
||||
@@ -89,7 +103,7 @@ class Admin::AsksController < OrbitAdminController
|
||||
@ask_setting = AskSetting.first
|
||||
@ask_setting = AskSetting.create() if @ask_setting.nil?
|
||||
@tags = @module_app.tags
|
||||
@categories = @module_app.categories
|
||||
@categories = @module_app.categories.enabled.sort_by{|category| (((module_app.asc rescue true) ? category.sort_number.to_i : -category.sort_number.to_i) rescue category.id)}
|
||||
@filter_fields = filter_fields(@categories, @tags)
|
||||
# 列表欄位
|
||||
@table_fields = [:situation, :category, 'title' , 'ask.name', 'ask.phone', 'ask.appointment','ask.created_at']
|
||||
@@ -125,9 +139,9 @@ class Admin::AsksController < OrbitAdminController
|
||||
end
|
||||
def category_setting
|
||||
@default_ask_setting = AskSetting.first
|
||||
@categories = @module_app.categories
|
||||
@category_ids = @categories.pluck(:id)
|
||||
@category_titles = @categories.pluck(:title).collect{|v| v[I18n.locale]}
|
||||
@categories = current_user.approved_categories_for_module(@module_app).sort_by{|category| (((module_app.asc rescue true) ? category.sort_number.to_i : -category.sort_number.to_i) rescue category.id)}
|
||||
@category_ids = @categories.collect(&:id)
|
||||
@category_titles = @categories.collect{|v| v.title}
|
||||
|
||||
@category_added = AskCategorySetting.all.asc(:created_at)
|
||||
@category_added_ids = @category_added.pluck(:category_id)
|
||||
@@ -386,7 +400,9 @@ class Admin::AsksController < OrbitAdminController
|
||||
@ask_question = AskQuestion.find(params[:id])
|
||||
end
|
||||
def order_fields
|
||||
@disp_fields_infos = AskSetting.get_disp_fields_infos(params[:category])
|
||||
@cats_relations = get_categories_info
|
||||
@category_id = (params[:category] || @cats_relations[0][0] rescue nil)
|
||||
@disp_fields_infos = AskSetting.get_disp_fields_infos(@category_id)
|
||||
end
|
||||
def update_order_fields
|
||||
if params[:category]
|
||||
|
||||
Reference in new issue
Block a user