diff --git a/app/assets/javascripts/users/settings/teams.js b/app/assets/javascripts/users/settings/teams.js index 973457ecf..6e1008211 100644 --- a/app/assets/javascripts/users/settings/teams.js +++ b/app/assets/javascripts/users/settings/teams.js @@ -56,38 +56,4 @@ function initLeaveTeams() { ); } -// Initialize teams DataTable -function initTeamsTable() { - teamsDatatable = $('#teams-table').DataTable({ - order: [[0, 'asc']], - dom: 'RBltpi', - stateSave: true, - buttons: [], - processing: true, - serverSide: true, - ajax: { - url: $('#teams-table').data('source'), - type: 'POST' - }, - colReorder: { - fixedColumnsLeft: 1000000 // Disable reordering - }, - columnDefs: [{ - targets: [0, 1], - orderable: true, - searchable: false - }, { - targets: [2], - searchable: false, - orderable: true - }, { - targets: [3], - searchable: false, - orderable: false, - sWidth: '1%' - }] - }); -} - -initTeamsTable(); initLeaveTeams(); diff --git a/app/assets/javascripts/users/settings/teams_datatable.js b/app/assets/javascripts/users/settings/teams_datatable.js new file mode 100644 index 000000000..3f086bcbe --- /dev/null +++ b/app/assets/javascripts/users/settings/teams_datatable.js @@ -0,0 +1,34 @@ +// Initialize teams DataTable +function initTeamsTable() { + teamsDatatable = $('#teams-table').DataTable({ + order: [[0, 'asc']], + dom: 'RBltpi', + stateSave: true, + buttons: [], + processing: true, + serverSide: true, + ajax: { + url: $('#teams-table').data('source'), + type: 'POST' + }, + colReorder: { + fixedColumnsLeft: 1000000 // Disable reordering + }, + columnDefs: [{ + targets: [0, 1], + orderable: true, + searchable: false + }, { + targets: [2], + searchable: false, + orderable: true + }, { + targets: [3], + searchable: false, + orderable: false, + sWidth: '1%' + }] + }); +} + +initTeamsTable(); diff --git a/app/views/users/settings/teams.html.erb b/app/views/users/settings/teams.html.erb index 004d1a77d..41588a549 100644 --- a/app/views/users/settings/teams.html.erb +++ b/app/views/users/settings/teams.html.erb @@ -46,3 +46,4 @@ <%= render partial: "users/settings/teams/leave_user_team_modal.html.erb" %> <%= stylesheet_link_tag 'datatables' %> <%= javascript_include_tag "users/settings/teams" %> +<%= javascript_include_tag "users/settings/teams_datatable" %> diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index c7f15a784..8c61b3783 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -15,6 +15,8 @@ Rails.application.config.assets.precompile += %w(jsnetworkx.js) Rails.application.config.assets.precompile += %w(handsontable.full.min.js) Rails.application.config.assets.precompile += %w(users/settings/preferences.js) Rails.application.config.assets.precompile += %w(users/settings/teams.js) +Rails.application.config.assets.precompile += + %w(users/settings/teams_datatable.js) Rails.application.config.assets.precompile += %w(users/settings/teams/add_user_modal.js) Rails.application.config.assets.precompile += %w(users/settings/team.js)