about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-11-30 15:32:26 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-11-30 15:32:26 +0100
commit356d3874ebd79573a8da58e2ac76eaa4612cec16 (patch)
treeb76762284e00bc386702a01fc70d9d04e235ac13 /app
parent4a2347da41278999c0e7441bcd7c5a42a67ba0ee (diff)
Normalize localizations, add stub for admin/accounts
Diffstat (limited to 'app')
-rw-r--r--app/controllers/admin/accounts_controller.rb13
-rw-r--r--app/controllers/application_controller.rb2
-rw-r--r--app/helpers/admin/accounts_helper.rb2
-rw-r--r--app/views/admin/accounts/index.html.haml0
-rw-r--r--app/views/admin/accounts/show.html.haml0
5 files changed, 16 insertions, 1 deletions
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb
new file mode 100644
index 000000000..e84799040
--- /dev/null
+++ b/app/controllers/admin/accounts_controller.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Admin::AccountsController < ApplicationController
+  before_action :require_admin!
+
+  layout 'public'
+
+  def index
+  end
+
+  def show
+  end
+end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index bb52646a7..5243bc446 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -37,7 +37,7 @@ class ApplicationController < ActionController::Base
   end
 
   def set_user_activity
-    current_user.touch(:current_sign_in_at) if !current_user.nil? && current_user.current_sign_in_at < 24.hours.ago
+    current_user.touch(:current_sign_in_at) if !current_user.nil? && (current_user.current_sign_in_at.nil? || current_user.current_sign_in_at < 24.hours.ago)
   end
 
   protected
diff --git a/app/helpers/admin/accounts_helper.rb b/app/helpers/admin/accounts_helper.rb
new file mode 100644
index 000000000..5b9cbbacd
--- /dev/null
+++ b/app/helpers/admin/accounts_helper.rb
@@ -0,0 +1,2 @@
+module Admin::AccountsHelper
+end
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/app/views/admin/accounts/index.html.haml
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/app/views/admin/accounts/show.html.haml