diff --git a/app/controllers/statistics_controller.rb b/app/controllers/statistics_controller.rb index e3d9aa60..bb22f89c 100644 --- a/app/controllers/statistics_controller.rb +++ b/app/controllers/statistics_controller.rb @@ -1,7 +1,8 @@ class StatisticsController < ApplicationController include StatisticsHelper - before_action :authorize!, only: [:show, :graphs, :user_activity, :rfc_activity] + before_action :authorize!, only: [:show, :graphs, :user_activity, :user_activity_history, :rfc_activity, + :rfc_activity_history] def policy_class StatisticsPolicy @@ -23,12 +24,18 @@ class StatisticsController < ApplicationController end end + def user_activity_history + end + def rfc_activity respond_to do |format| format.json { render(json: rfc_activity_live_data) } end end + def rfc_activity_history + end + def authorize! authorize self end diff --git a/app/policies/statistics_policy.rb b/app/policies/statistics_policy.rb index 9486c79a..e04a5f66 100644 --- a/app/policies/statistics_policy.rb +++ b/app/policies/statistics_policy.rb @@ -1,15 +1,7 @@ class StatisticsPolicy < AdminOnlyPolicy - def graphs? - admin? - end - - def user_activity? - admin? - end - - def rfc_activity? - admin? + [:graphs?, :user_activity?, :user_activity_history?, :rfc_activity?, :rfc_activity_history?].each do |action| + define_method(action) { admin? } end end diff --git a/app/views/statistics/graphs.html.slim b/app/views/statistics/graphs.html.slim index e9c88a8a..75baf168 100644 --- a/app/views/statistics/graphs.html.slim +++ b/app/views/statistics/graphs.html.slim @@ -5,13 +5,13 @@ .group .title h1 = t('.user_activity') - a href='#' = t('.history') + a href=statistics_graphs_user_activity_history_path = t('.history') .spinner .graph#user-activity .group .title h1 = t('.rfc_activity') - a href='#' = t('.history') + a href=statistics_graphs_rfc_activity_history_path = t('.history') .spinner .graph#rfc-activity diff --git a/app/views/statistics/rfc_activity_history.html.slim b/app/views/statistics/rfc_activity_history.html.slim new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/app/views/statistics/rfc_activity_history.html.slim @@ -0,0 +1 @@ + diff --git a/app/views/statistics/user_activity_history.html.slim b/app/views/statistics/user_activity_history.html.slim new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/app/views/statistics/user_activity_history.html.slim @@ -0,0 +1 @@ + diff --git a/config/locales/de.yml b/config/locales/de.yml index 0362a8f5..dd962e72 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -222,6 +222,8 @@ de: statistics: show: "Statistiken" graphs: "Visualisierungen" + user_activity_history: Nutzeraktivitätshistorie + rfc_activity_history: Kommentaranfragenhistorie consumers: show: link: Konsument diff --git a/config/locales/en.yml b/config/locales/en.yml index 404305ab..5a5f6e08 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -222,6 +222,8 @@ en: statistics: show: "Statistics" graphs: "Graphs" + user_activity_history: User Activity History + rfc_activity_history: RfC Activity History consumers: show: link: Consumer diff --git a/config/routes.rb b/config/routes.rb index 499120ec..4ab758d9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -45,7 +45,9 @@ Rails.application.routes.draw do get 'statistics/', to: 'statistics#show' get 'statistics/graphs', to: 'statistics#graphs' get 'statistics/graphs/user-activity', to: 'statistics#user_activity' + get 'statistics/graphs/user-activity-history', to: 'statistics#user_activity_history' get 'statistics/graphs/rfc-activity', to: 'statistics#rfc_activity' + get 'statistics/graphs/rfc-activity-history', to: 'statistics#rfc_activity_history' concern :statistics do member do