kadmin 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f717d9066d91ad2a0a1acfd5303d408ff7c5942f0b822828f5fadea2c57d326
-  data.tar.gz: 66bad7f74122ff12a435d03ffef350acbf0f1eead76b593b42d80229e8d4b424
+  metadata.gz: 0a67342d7ed2220a376c8b010e75b090b078f8b94f053d07a8de7f49f7457c8d
+  data.tar.gz: af6c66e446b5e87cf4a7cd50ef6d94c1d42a2360f8eef72c66728b293bf2a379
 SHA512:
-  metadata.gz: c27975cf9d04ea202c1c0e4a6f72b2f3726a598ffe85d87fa3df8121fa22035385b04ef4016ad9b961a9ece840254074e48bd70659a419650967c7af9b4bf2b6
-  data.tar.gz: 82394a5cbe9b005bbdec7a9975a4d18291ee68ec864b5402005705d008ed33b52649535970db465660e7dd7ad3fd08431e8ddff9495638e5e3b9bff2ebd9fb79
+  metadata.gz: b7710e4b73016d2e9d826ec9b6246978e25dccaa19e38cbd22c50830f6824fb5c91b22dd5ef7d75227577b96522ea2d9e0bb9fb505c5ce553307eb1657d327d6
+  data.tar.gz: c3e79b1da1127d9cbd42fcd71e060e34b9c7603fc69c04e8a5e2238ba9bb43a30b6958e2019b3551338a31e19cfcd140f750acc3b2ade37d26ee3cbf6687761b

data/app/controllers/kadmin/application_controller.rb

@@ -57,30 +57,14 @@ module Kadmin
     #
     # organization_scoped_ar is an ActiveRecord that has organization_scope(Organization) scope defined
     def scoped_find_by!(organization_scoped_ar, id)
-      if authorized_user.admin?
-        if id.is_a?(Array)
-          return organization_scoped_ar.find(id)
-        else
-          return organization_scoped_ar.find_by!(id: id)
-        end
-      else
-        if id.is_a?(Array)
-          return organization_scoped_ar.organization_scope(@organization).find(id)
-        else
-          return organization_scoped_ar.organization_scope(@organization).find_by!(id: id)
-        end
-      end
+      return organization_scoped_ar.organization_scope(@organization).find(id)
     end
 
     # returns all organization_scoped_ar object(s) that are of the user's organization. admin user gets all.
     # you can chain scopes, e.g. scoped_all(Segments.my_scope) is valid
     # organization_scoped_ar is an ActiveRecord that has organization_scope(Organization) scope defined
     def scoped_all(organization_scoped_ar)
-      if authorized_user.admin?
-        organization_scoped_ar.all
-      else
-        organization_scoped_ar.organization_scope(organization).all
-      end
+      organization_scoped_ar.organization_scope(organization).all
     end
 
     def organization

data/app/controllers/kadmin/auth_controller.rb

@@ -60,6 +60,14 @@ module Kadmin
       }
     end
 
+    # POST /change_organization
+    def change_organization
+      if authorized_user&.admin?
+        authorized_user.organization = Kadmin::Organization.find(params[:organization_id]).name
+      end
+      redirect_to :dash
+    end
+
     # @!endgroup
 
     # @!group Helpers

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

@@ -22,7 +22,13 @@
 					<div class="header-block header-block-nav">
 						<ul class="nav-profile">
 						  <% if logged_in? %>
-								<li style="padding-right: 10px;"><%= authorized_user.organization %></li>
+						  	<% if authorized_user.admin? %>
+						  		<%= form_tag(Kadmin::Engine.routes.url_helpers.auth_change_organization_path) do -%>
+						  		<%= select_tag('organization_id', options_from_collection_for_select(Kadmin::Organization.all, :id, :name, @organization.id), onchange: "this.form.submit();", class: 'form-control')%>
+						  		<% end -%>
+              	<% else %>
+									<li style="padding-right: 10px;"><%= authorized_user.organization %></li>
+								<% end %>
 								<li><%= link_to(t('kadmin.authorization.logout'), Kadmin::Engine.routes.url_helpers.auth_logout_path) %></li>
 							<% end %>
 						</ul>

data/config/routes.rb

@@ -8,5 +8,6 @@ Kadmin::Engine.routes.draw do
     get '/failure', action: :failure, as: :failure
     get '/unauthorized', action: :unauthorized, as: :unauthorized
     get '/', action: :login
+    post '/change_organization', action: :change_organization, as: :change_organization
   end
 end

data/lib/kadmin/auth/user.rb

@@ -5,16 +5,21 @@ module Kadmin
 
       def initialize(email, options = {})
         @email = email
+        @admin = options[:admin]
         @organization = options[:organization]
         @accept = options[:accept]
       end
 
+      def organization=(organization)
+        @organization = organization if self.admin?
+      end
+
       def authorized?(_request)
         return true
       end
 
       def admin?
-        return true
+        return @admin
       end
     end
   end

data/lib/kadmin/configuration.rb

@@ -31,7 +31,7 @@ module Kadmin
     # 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 if user.accept.blank? && user.admin? # no accept array and super admin -> 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

data/lib/kadmin/version.rb

@@ -1,3 +1,3 @@
 module Kadmin
-  VERSION = '1.0.5'.freeze
+  VERSION = '1.0.6'.freeze
 end

metadata

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