diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 5664e7303..31ceb32f0 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -15,21 +15,32 @@ //= require foundation //= require turbolinks //= require ckeditor/init +//= require_directory ./ckeditor //= require social-share-button //= require initial //= require ahoy -//= require d3 -//= require c3 -//= require c3ext //= require app -//= require_tree . +//= require check_all_none +//= require comments +//= require dropdown +//= require ie_alert +//= require location_changer +//= require moderator_comment +//= require moderator_debates +//= require moderator_proposals +//= require prevent_double_submission +//= require rem.min +//= require respond.min +//= require tags +//= require users +//= require votes + var initialize_modules = function() { App.Comments.initialize(); App.Users.initialize(); App.Votes.initialize(); App.Tags.initialize(); - App.Stats.initialize(); App.Dropdown.initialize(); App.LocationChanger.initialize(); App.CheckAllNone.initialize(); diff --git a/app/assets/javascripts/stat_graphs.js b/app/assets/javascripts/stat_graphs.js new file mode 100644 index 000000000..e21d88ff0 --- /dev/null +++ b/app/assets/javascripts/stat_graphs.js @@ -0,0 +1,15 @@ +//= require d3 +//= require c3 +//= require c3ext +//= require stats + +var initialize_stats_modules = function() { + App.Stats.initialize(); +}; + +$(function(){ + + $(document).ready(initialize_stats_modules); + $(document).on('page:load', initialize_stats_modules); + $(document).on('ajax:complete', initialize_stats_modules); +}); diff --git a/app/controllers/admin/stats_controller.rb b/app/controllers/admin/stats_controller.rb new file mode 100644 index 000000000..3bcb50a86 --- /dev/null +++ b/app/controllers/admin/stats_controller.rb @@ -0,0 +1,7 @@ +class Admin::StatsController < Admin::BaseController + + def show + @event_types = Ahoy::Event.group(:name).count + end + +end diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb deleted file mode 100644 index 5802ee9e9..000000000 --- a/app/controllers/stats_controller.rb +++ /dev/null @@ -1,14 +0,0 @@ -class StatsController < ApplicationController - before_action :verify_administrator - skip_authorization_check - - def show - @event_types = Ahoy::Event.group(:name).count - end - - private - - def verify_administrator - raise CanCan::AccessDenied unless current_user.try(:administrator?) - end -end diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index 89e1b6641..39d172790 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -75,7 +75,7 @@