diff --git a/app/controllers/admin/universal_tables_controller.rb b/app/controllers/admin/universal_tables_controller.rb index a45b273..86cfa92 100644 --- a/app/controllers/admin/universal_tables_controller.rb +++ b/app/controllers/admin/universal_tables_controller.rb @@ -230,7 +230,7 @@ end def add_entry entry = TableEntry.new(table_entry_params) - create_get_table_tags(@entry) + create_get_table_tags(entry) entry.save entry.fix_have_data table = UTable.find(params[:table_entry][:u_table_id]) @@ -263,6 +263,13 @@ end redirect_to admin_universal_table_path(:id=> table.to_param, :page => params[:page]) end + def toggle_entries + ids = params[:ids] + hidden = params[:status] == "hide" + TableEntry.where(:id.in => ids).update_all(is_hidden: hidden) + render :json => {"success" => true}.to_json + end + def new @table = UTable.new end @@ -338,7 +345,7 @@ end columns_count = columns.count columns_count = 1 if columns_count==0 columns = Kaminari.paginate_array(columns,limit: columns_count) - entries = TableEntry.where(:u_table_id=>table.id).sorting(params: params,table: table,column_entries: columns,page_num: params[:page],per: per) + entries = TableEntry.where(:u_table_id=>table.id).can_display.sorting(params: params,table: table,column_entries: columns,page_num: params[:page],per: per) end def table_params diff --git a/app/controllers/universal_tables_controller.rb b/app/controllers/universal_tables_controller.rb index f76f9c3..8d4b323 100644 --- a/app/controllers/universal_tables_controller.rb +++ b/app/controllers/universal_tables_controller.rb @@ -127,15 +127,15 @@ class UniversalTablesController < ApplicationController end if paginated if tag.nil? - entries = TableEntry.where(:u_table_id=>table.id, "have_data.#{I18n.locale}" => {"$in" => [nil, true]}).sorting(params: params,table: table,page_num: params["page_no"],per: OrbitHelper.page_data_count) + entries = TableEntry.where(:u_table_id=>table.id, "have_data.#{I18n.locale}" => {"$in" => [nil, true]}).can_display.sorting(params: params,table: table,page_num: params["page_no"],per: OrbitHelper.page_data_count) else - entries = TableEntry.where(:u_table_id=>table.id, "have_data.#{I18n.locale}" => {"$in" => [nil, true]}, :table_tag_ids => tag.id).sorting(params: params,table: table,page_num: params["page_no"],per: OrbitHelper.page_data_count) + entries = TableEntry.where(:u_table_id=>table.id, "have_data.#{I18n.locale}" => {"$in" => [nil, true]}, :table_tag_ids => tag.id).can_display.sorting(params: params,table: table,page_num: params["page_no"],per: OrbitHelper.page_data_count) end else if tag.nil? - entries = TableEntry.where(:u_table_id=>table.id, "have_data.#{I18n.locale}" => {"$in" => [nil, true]}).sorting(params: params,table: table,paginated: false) + entries = TableEntry.where(:u_table_id=>table.id, "have_data.#{I18n.locale}" => {"$in" => [nil, true]}).can_display.sorting(params: params,table: table,paginated: false) else - entries = TableEntry.where(:u_table_id=>table.id, "have_data.#{I18n.locale}" => {"$in" => [nil, true]}, :table_tag_ids => tag.id).sorting(params: params,table: table,paginated: false) + entries = TableEntry.where(:u_table_id=>table.id, "have_data.#{I18n.locale}" => {"$in" => [nil, true]}, :table_tag_ids => tag.id).can_display.sorting(params: params,table: table,paginated: false) end end end diff --git a/app/models/table_entry.rb b/app/models/table_entry.rb index f347272..f478c80 100644 --- a/app/models/table_entry.rb +++ b/app/models/table_entry.rb @@ -1,6 +1,7 @@ class TableEntry include Mongoid::Document include Mongoid::Timestamps + include OrbitModel::Status include Slug attr_accessor :sort_value @@ -14,6 +15,7 @@ class TableEntry has_and_belongs_to_many :table_tags, inverse_of: :table_entries accepts_nested_attributes_for :column_entries, :allow_destroy => true + scope :can_display, ->{where(:is_hidden.ne=>true)} I18n.available_locales.each do |locale| index({"have_data.#{locale}" => 1}, { unique: false, background: true }) diff --git a/app/views/admin/universal_tables/show.html.erb b/app/views/admin/universal_tables/show.html.erb index c8f6eae..4fc0412 100644 --- a/app/views/admin/universal_tables/show.html.erb +++ b/app/views/admin/universal_tables/show.html.erb @@ -1,6 +1,11 @@ <% content_for :page_specific_css do %> <%= stylesheet_link_tag "universal_table/universal-table" %> <% end %> +