From 44adbf57b2705337a43a3cb2e7414f751af563c1 Mon Sep 17 00:00:00 2001 From: Saurabh Bhatia Date: Wed, 9 Jul 2014 17:21:37 +0800 Subject: [PATCH] make users autoapproved once imported, orbit member accessible only to admin --- app/controllers/admin/import_controller.rb | 1 + app/controllers/orbit_member_controller.rb | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/import_controller.rb b/app/controllers/admin/import_controller.rb index 8923711..65d2292 100644 --- a/app/controllers/admin/import_controller.rb +++ b/app/controllers/admin/import_controller.rb @@ -572,6 +572,7 @@ class Admin::ImportController < OrbitAdminController user.workgroup = w end user.member_profile = new_member + user.approved = true user.save end end diff --git a/app/controllers/orbit_member_controller.rb b/app/controllers/orbit_member_controller.rb index eee72d4..a536d3b 100644 --- a/app/controllers/orbit_member_controller.rb +++ b/app/controllers/orbit_member_controller.rb @@ -1,6 +1,13 @@ class OrbitMemberController < ApplicationController include OrbitBackendHelper - before_action :authenticate_user + before_action :authenticate_user, :check_admin layout "member" + + def check_admin + if current_user.is_admin? + else + render "public/404" + end + end end