kadmin 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f56c7b735666074f5e864e1d5c116ff1e64c645abb8eb96c7a04751975832b87
-  data.tar.gz: e70fc7a5ce5f0755713dbf4353d2688f3f53c686f47a9f915167cb81c89d2ab7
+  metadata.gz: 51c3cae4ed7c833aa663c74fa0ab036f3976c273869df2613721499d4d297d12
+  data.tar.gz: ddf52353bb65ec10d8865ad6e18535d4dcf02bdb7dfbfd93f8da6405f6f4ccf6
 SHA512:
-  metadata.gz: fa823ecd24ecfeae42ecd2783c0cce6c796412adde662c362c5fec7c4e1254d44d210114474566d941ca23411689eab72c491de353d28a6b08633355359a97d3
-  data.tar.gz: e881dc85cb13f0c828c2042d96ef754c5b1a4ac12bb81136fb9027617db811049a61e6f05bed00d04c29415a48873a4fac4d5aa7e45ac155bb0c5015c0f0feac
+  metadata.gz: 4237584dd64f1e5c1f76adb2c1f1b465075742a12b05786e62f46a5f77b8b54e35cc99d38f68289d6f3b5e41e85998c7486580e1e98491c763ea4de79670586a
+  data.tar.gz: 5529f972678b909a6288796de6c0b8c829412c8835df306040ccf109961f061d55c56e77139a15cd8decc57096175c68a7da17f414da489618f0e1d6422e1eaf

data/app/views/layouts/kadmin/application.html.erb

@@ -21,8 +21,9 @@
 				<header class="header">
 					<div class="header-block header-block-nav">
 						<ul class="nav-profile">
-							<% if logged_in? %>
-							<%= link_to(t('kadmin.authorization.logout'), Kadmin::Engine.routes.url_helpers.auth_logout_path) %>
+						  <% if logged_in? %>
+								<li><%= authorized_user.organization %></li>
+								<li><%= link_to(t('kadmin.authorization.logout'), Kadmin::Engine.routes.url_helpers.auth_logout_path) %></li>
 							<% end %>
 						</ul>
 					</div>
@@ -37,7 +38,7 @@
 						<% if (!Kadmin::Auth.config.enabled? || logged_in?) && !Kadmin.config.navbar_items.empty? %>
 						<nav class="menu">
 							<ul class="nav metismenu" id="sidebar-menu">
-								<% Kadmin.config.navbar_items.each do |item| %>
+								<% Kadmin.config.navbar_items_for_user(authorized_user).each do |item| %>
 								<%= item.present(self).render %>
 								<% end %>
 							</ul>

data/lib/kadmin/auth/user.rb

@@ -6,6 +6,7 @@ module Kadmin
       def initialize(email, options = {})
         @email = email
         @organization = options[:organization]
+        @accept = options[:accept]
       end
 
       def authorized?(_request)
@@ -15,7 +16,6 @@ module Kadmin
       def admin?
         return true
       end
-
     end
   end
 end

data/lib/kadmin/auth/user_store.rb

@@ -20,7 +20,7 @@ module Kadmin
 
       def load_users!
         file = Rails.root.join('config', 'admin_users.yml')
-        if File.exists?(file) && File.readable?(file)
+        if File.exist?(file) && File.readable?(file)
           definitions = YAML.load_file(file.to_s)
           definitions.each do |definition|
             email = definition['email']

data/lib/kadmin/configuration.rb

@@ -27,5 +27,14 @@ module Kadmin
         @navbar_items.insert(index || @navbar_items.size, item)
       end
     end
+
+    # filter available nav sections with the user's accept string
+    def navbar_items_for_user(user)
+      return [] if user.blank? # no user, no links
+      return @navbar_items if user.accept.blank? # no accept array -> everything is accepted
+      return @navbar_items.select do |navbar_item|
+        user.accept.any? { |accept_string| navbar_item.text =~ /#{accept_string.to_s.split('_').first}/i }
+      end
+    end
   end
 end

data/lib/kadmin/version.rb

@@ -1,3 +1,3 @@
 module Kadmin
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kadmin
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Nicolas Pepin-Perreault
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-10 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails