upgrade datatables gem
This commit is contained in:
parent
18ee10eef5
commit
cd88882714
7 changed files with 23 additions and 10 deletions
3
Gemfile
3
Gemfile
|
|
@ -116,8 +116,9 @@ end
|
||||||
gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47'
|
gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47'
|
||||||
|
|
||||||
# data tables
|
# data tables
|
||||||
|
gem 'jquery-datatables'
|
||||||
gem 'ajax-datatables-rails'
|
gem 'ajax-datatables-rails'
|
||||||
gem 'jquery-datatables-rails'
|
# gem 'jquery-datatables-rails'
|
||||||
|
|
||||||
# for charts
|
# for charts
|
||||||
gem 'chartkick'
|
gem 'chartkick'
|
||||||
|
|
|
||||||
|
|
@ -238,11 +238,7 @@ GEM
|
||||||
io-like (0.3.0)
|
io-like (0.3.0)
|
||||||
iso-639 (0.2.8)
|
iso-639 (0.2.8)
|
||||||
jaro_winkler (1.5.3)
|
jaro_winkler (1.5.3)
|
||||||
jquery-datatables-rails (3.4.0)
|
jquery-datatables (1.10.20)
|
||||||
actionpack (>= 3.1)
|
|
||||||
jquery-rails
|
|
||||||
railties (>= 3.1)
|
|
||||||
sass-rails
|
|
||||||
jquery-rails (4.3.5)
|
jquery-rails (4.3.5)
|
||||||
rails-dom-testing (>= 1, < 3)
|
rails-dom-testing (>= 1, < 3)
|
||||||
railties (>= 4.2.0)
|
railties (>= 4.2.0)
|
||||||
|
|
@ -650,7 +646,7 @@ DEPENDENCIES
|
||||||
haml-rails
|
haml-rails
|
||||||
haml_lint
|
haml_lint
|
||||||
iso-639
|
iso-639
|
||||||
jquery-datatables-rails
|
jquery-datatables
|
||||||
jquery-rails
|
jquery-rails
|
||||||
jquery-ui-rails (~> 4.2.1)
|
jquery-ui-rails (~> 4.2.1)
|
||||||
json-schema
|
json-schema
|
||||||
|
|
|
||||||
|
|
@ -16,8 +16,14 @@
|
||||||
//= require jquery.ui.draggable
|
//= require jquery.ui.draggable
|
||||||
//= require jquery.ui.droppable
|
//= require jquery.ui.droppable
|
||||||
//= require waypoints/jquery.waypoints
|
//= require waypoints/jquery.waypoints
|
||||||
|
|
||||||
//= require dataTables/jquery.dataTables
|
//= require dataTables/jquery.dataTables
|
||||||
//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
|
//= require dataTables/dataTables.bootstrap
|
||||||
|
//= require datatables/extensions/Buttons/dataTables.buttons
|
||||||
|
//= require datatables/extensions/Buttons/buttons.bootstrap
|
||||||
|
// = require datatables/extensions/Buttons/buttons.html5
|
||||||
|
// = require datatables/extensions/Buttons/buttons.dataTables
|
||||||
|
|
||||||
//= require cocoon
|
//= require cocoon
|
||||||
//= require bootstrap
|
//= require bootstrap
|
||||||
//= require Chart.bundle
|
//= require Chart.bundle
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
$(function () {
|
$(function () {
|
||||||
$.extend(true, $.fn.dataTable.defaults, {
|
$.extend(true, $.fn.dataTable.defaults, {
|
||||||
|
"buttons": ["csv"],
|
||||||
|
"dom": "lBfrtip",
|
||||||
"stateSave": true,
|
"stateSave": true,
|
||||||
"autoWidth": false,
|
"autoWidth": false,
|
||||||
"pagingType": "full_numbers",
|
"pagingType": "full_numbers",
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,13 @@
|
||||||
/*
|
/*
|
||||||
|
*= require dataTables/dataTables.bootstrap
|
||||||
|
*= require datatables/extensions/Responsive/responsive.dataTables
|
||||||
|
*= require dataTables/extensions/Responsive/responsive.bootstrap
|
||||||
|
*= require dataTables/extensions/Select/select.bootstrap
|
||||||
|
*= require dataTables/extensions/Buttons/buttons.dataTables
|
||||||
|
*= require dataTables/extensions/Buttons/buttons.bootstrap
|
||||||
*= require strap-on
|
*= require strap-on
|
||||||
*= require formtastic-bootstrap
|
*= require formtastic-bootstrap
|
||||||
*= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
|
|
||||||
*= require selectize
|
*= require selectize
|
||||||
*= require selectize.bootstrap3
|
*= require selectize.bootstrap3
|
||||||
*= require bootstrap-select
|
*= require bootstrap-select
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,8 @@ module Admin
|
||||||
# load_and_authorize_resource :event, through: :program
|
# load_and_authorize_resource :event, through: :program
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@events = Event.accessible_by(current_ability).where(program: @program)
|
@events = Event.accessible_by(current_ability).where(program: @program,
|
||||||
|
state: [:confirmed, :unconfirmed])
|
||||||
@events_commercials = Commercial.where(commercialable_type: 'Event', commercialable_id: @events.pluck(:id))
|
@events_commercials = Commercial.where(commercialable_type: 'Event', commercialable_id: @events.pluck(:id))
|
||||||
@events_missing_commercial = @events.where.not(id: @events_commercials.pluck(:commercialable_id))
|
@events_missing_commercial = @events.where.not(id: @events_commercials.pluck(:commercialable_id))
|
||||||
@events_with_requirements = @events.where.not(description: ['', nil])
|
@events_with_requirements = @events.where.not(description: ['', nil])
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@
|
||||||
:javascript
|
:javascript
|
||||||
$(function () {
|
$(function () {
|
||||||
$('#users.datatable').DataTable({
|
$('#users.datatable').DataTable({
|
||||||
|
"buttons": { buttons: ["csv"] },
|
||||||
"processing": true,
|
"processing": true,
|
||||||
"serverSide": true,
|
"serverSide": true,
|
||||||
"ajax": $('#users.datatable').data('source'),
|
"ajax": $('#users.datatable').data('source'),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue