eliminated naming clash with Sorcery

2015-02-23 10:39:04 +01:00
parent 2180c3878e
commit 466f8967e2
11 changed files with 35 additions and 15 deletions
--- a/app/views/application/_breadcrumbs.html.slim
+++ b/app/views/application/_breadcrumbs.html.slim
@@ -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])
--- a/app/views/application/_navigation.html.slim
+++ b/app/views/application/_navigation.html.slim
@@ -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='#'
--- a/app/views/application/_session.html.slim
+++ b/app/views/application/_session.html.slim
@@ -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