eliminated naming clash with Sorcery

This commit is contained in:
Hauke Klement
2015-02-23 10:39:04 +01:00
parent 2180c3878e
commit 466f8967e2
11 changed files with 35 additions and 15 deletions

View File

@@ -26,7 +26,7 @@ class SessionsController < ApplicationController
end
def destroy
if current_user.external?
if current_user.external_user?
clear_lti_session_data
else
logout

View File

@@ -16,12 +16,8 @@ module User
define_method("#{role}?") { try(:role) == role }
end
def external?
is_a?(ExternalUser)
end
def internal?
is_a?(InternalUser)
[ExternalUser, InternalUser].each do |klass|
define_method("#{klass.name.underscore}?") { is_a?(klass) }
end
def to_s

View File

@@ -1,6 +1,6 @@
class AdminOrAuthorPolicy < ApplicationPolicy
[:create?, :index?, :new?].each do |action|
define_method(action) { @user.internal? }
define_method(action) { @user.internal_user? }
end
[:destroy?, :edit?, :show?, :update?].each do |action|

View File

@@ -21,7 +21,7 @@ class ExercisePolicy < AdminOrAuthorPolicy
def resolve
if @user.admin?
@scope.all
elsif @user.internal?
elsif @user.internal_user?
@scope.where("user_id = #{@user.id} OR public = TRUE OR (team_id IS NOT NULL AND team_id IN (SELECT t.id FROM teams t JOIN internal_users_teams iut ON t.id = iut.team_id WHERE iut.internal_user_id = #{@user.id}))")
else
@scope.none

View File

@@ -1,6 +1,6 @@
class TeamPolicy < ApplicationPolicy
[:create?, :index?, :new?].each do |action|
define_method(action) { @user.internal? }
define_method(action) { @user.internal_user? }
end
[:destroy?, :edit?, :show?, :update?].each do |action|

View File

@@ -1,4 +1,4 @@
- if current_user.try(:internal?)
- if current_user.try(:internal_user?)
ul.breadcrumb
- if model = Kernel.const_get(controller_name.classify) rescue nil
- object = model.find_by(id: params[:id])

View File

@@ -1,4 +1,4 @@
- if current_user.try(:internal?)
- if current_user.try(:internal_user?)
ul.nav.navbar-nav
li.dropdown
a.dropdown-toggle data-toggle='dropdown' href='#'

View File

@@ -1,5 +1,5 @@
- if current_user
- if current_user.internal?
- if current_user.internal_user?
li.dropdown
a.dropdown-toggle data-toggle='dropdown' href='#'
i.glyphicon.glyphicon-user