five-two-nw-olivander 0.1.2.16 → 0.1.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca705fdadd65b24ed0d39bdf729ad757aa2f7e0764c0d385963ae0c77144a9e6
-  data.tar.gz: b7ede6c6d6fc597db514b9c3117f72eee6bf834686fe4329db7e10b35dbdb92a
+  metadata.gz: 60ef0e4f6cf44268d5836df99ce2f7548b77f6494a1de083ec0374c58c5f823c
+  data.tar.gz: 56d4c32092f2fd4dbeca7f8470fb26f01a23b0a3f2f38e10a734119a745a39c3
 SHA512:
-  metadata.gz: 5e1d731c04b0ff1d86dea82e792c502c7719560e38f2e3ed3be97db851897c290d89ec8b7a751159232c0368c85329eb6f0d6c34159936ad49fced1107b6bbd1
-  data.tar.gz: a74487154d84ddf468651d19893864315e0669ba9b799da0f7c8aba653e8f6a8e41e33a5a9b21fc03ec5ab6eda17c98813738e982da4465da1991e1a1eef4925
+  metadata.gz: b58d17599c9bff68932f749af403b809bd7080a7e77fb9dacb943e5f5558e26010ea0cea38e461fa11abaf4847c3bdd81de376622c96c83b32e72df2208418d2
+  data.tar.gz: d2345d025f1460ea4c3a2c7b806885eb514cda39e284400e773da772ac68ebc64596d11841b5a11ae393ffdd3ea5d041e5bc5d580bff50eb79ec5003118167fa

data/app/helpers/olivander/application_helper.rb

@@ -36,5 +36,13 @@ module Olivander
         end
       end.join(' ').html_safe
     end
+
+    def current_user
+      controller.respond_to?(:current_user) ? controller.current_user : nil
+    end
+
+    def current_ability
+      controller.respond_to?(:current_ability) ? controller.current_ability : nil
+    end
   end
 end

data/app/views/layouts/olivander/adminlte/_sidebar.html.haml

@@ -11,7 +11,7 @@
       .image
         %img.img-circle.elevation-2{:alt => "User Image", :src => image_path(user_image_path(nil))}/
       .info
-        = link_to current_erp_user, destroy_erp_user_session_path, method: :delete, class: 'd-block'
+        = link_to current_user, @context.sign_out_path, method: :delete, class: 'd-block'
     / SidebarSearch Form
     .form-inline
       .input-group{"data-widget" => "sidebar-search"}

data/lib/olivander/application_context.rb

@@ -1,6 +1,6 @@
 module Olivander
   class ApplicationContext
-    attr_accessor :name, :logo, :company, :menu_items, :route_builder
+    attr_accessor :name, :logo, :company, :menu_items, :route_builder, :sign_out_path
 
     def self.default
       ctx = ApplicationContext.new
@@ -8,10 +8,11 @@ module Olivander
       ctx
     end
 
-    def initialize(name: 'Application Name', logo: Logo.new, company: Company.new, menu_items: [])
+    def initialize(name: 'Application Name', logo: Logo.new, company: Company.new, sign_out_path: '/sign_out', menu_items: [])
       self.name = name
       self.logo = logo
       self.company = company
+      self.sign_out_path = sign_out_path
       self.menu_items = menu_items
     end
 

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = "0.1.2.16"
+  VERSION = "0.1.2.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.16
+  version: 0.1.2.17
 platform: ruby
 authors:
 - Eric Dennis