kadmin 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbf1d95b7f00f351e61cddfbef2de92dd0fb430d178601cab3dda443361d3fd9
-  data.tar.gz: 8a2a628316d861856b54b2667485dad1a97db402751a4ed6ba802a7eb5635eb2
+  metadata.gz: 6b77f3984bbb1305f00fd24d9e4f2ee58e5f816b4d46fe6f53ee4282e96182f1
+  data.tar.gz: 9cc07fbdde13d24818c964979cf0a87a4a57a4db38bb1be2a7502d024a0f69c8
 SHA512:
-  metadata.gz: 2caa4660e15c6f21803c8b47b7c7bd78d34777e589a440d115d85f1d67d148373f646a7f4ee6005887b5d460625917b50c4ea33ed7b439b3c186f4b070927eb2
-  data.tar.gz: 8cffec59ad655d1858aa4fbaa42d86f5135edc04432584f7cc16fda537677ba13a48bc82a1a4b4e9799e77751a83ad61f97b956454c378ffa16c6903ab1856f2
+  metadata.gz: c6244cd45d2ad12cff9051a5fdb51c3052116944c4e5b2f5c2490ed4ec73e6a9f3d052705c0c1c05b494215c52a2f521f679374fdba6420a192bb9e5b0af15bf
+  data.tar.gz: 5995dc8d92e23f4bb4447f03f9731ba8d8f74691eefbd67abea43d2d1c1b84222e8585640ec778db58e1f7092f3c8e8534c3d830d8d485567be74a3053b51b48

data/app/controllers/kadmin/application_controller.rb

@@ -68,9 +68,16 @@ module Kadmin
     end
 
     def organization
-      if authorized_user.present?
-        @organization ||= Kadmin::Organization.find_by!(name: authorized_user.organization)
+      return @organization if authorized_user.blank?
+      return @organization if @organization.present?
+
+      if session[Kadmin::AuthController::SESSION_ORG_OVERWRITE_KEY] && authorized_user.admin?
+        @organization = Kadmin::Organization.find_by!(name: session[AuthController::SESSION_ORG_OVERWRITE_KEY])
+      else
+        @organization = Kadmin::Organization.find_by!(name: authorized_user.organization)
       end
+
+      return @organization
     rescue ActiveRecord::RecordNotFound
       render plain: "Forbidden - organization #{authorized_user.organization} not found in DB", status: :forbidden
     end

data/app/controllers/kadmin/auth_controller.rb

@@ -1,6 +1,7 @@
 module Kadmin
   class AuthController < Kadmin::ApplicationController
     SESSION_KEY = 'kadmin.user'.freeze
+    SESSION_ORG_OVERWRITE_KEY = 'kadmin.org_overwrite'.freeze
 
     # Don't try to authenticate user on the authentication controller...
     skip_before_action :authorize
@@ -63,7 +64,7 @@ module Kadmin
     # POST /change_organization
     def change_organization
       if authorized_user&.admin?
-        authorized_user.organization = Kadmin::Organization.find(params[:organization_id]).name
+        session[SESSION_ORG_OVERWRITE_KEY] = Kadmin::Organization.find(params[:organization_id]).name
       end
       redirect_to :dash
     end

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

@@ -22,7 +22,7 @@
           <div class="header-block header-block-nav">
             <ul class="nav-profile">
               <% if logged_in? %>
-                <% if false && authorized_user.admin? %>
+                <% 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 -%>

data/lib/kadmin/version.rb

@@ -1,3 +1,3 @@
 module Kadmin
-  VERSION = '1.0.7'.freeze
+  VERSION = '1.0.8'.freeze
 end

metadata

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