ucb_rails_user 4.0.3 → 4.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9eb42cd87a9e36ca72c3cd6b781205f7a4854acd673b00b784d8a58c2136ea6
-  data.tar.gz: 75af2810f84a6ab8fc2af39ac6b633de8bf2d746d4cd94a9f77d7808ec92a141
+  metadata.gz: 3a8118f9d0b261b1ad04181b2fa0211c30535bedb47b75b1438275b6ef7c5af0
+  data.tar.gz: 7eee880cef304680125f21beaffeab8a6c95525beda0bfdb750920ab4c996f2e
 SHA512:
-  metadata.gz: 0c8e290178f63d2d1764d6bcc25d1fa2110fbe26cb2c78e8435225e54d757432619542e246cff58232f53926403ea783834d6ff5fe82df5c2fcf67e1f93847aa
-  data.tar.gz: 38dec97a527ac71b2142e252d42d69a4452a973881011cc090af264d7d27176e731316c01b5ccfc4b17cda1ab699900942a3d0925f591b7b316e4c89442cbf9e
+  metadata.gz: 9567b7aa7b943fd70cfe138345d191a84d36a92455e1eb0b6d1d472eb1bc17d09beea6c854804a7e8facea817ed8e2616ece9e27df6dda10bf95fc51e88911b8
+  data.tar.gz: 7e074a6ae931a175285882810cede02a0e83d0322d1c50302d2139df7e9230af1891e8015df91e59132cb27071e4e479b30bc1b0cacb1786b93452c2612e4e30

data/README.md

@@ -16,7 +16,7 @@ This engine also includes the [Datatables](https://datatables.net/) JQuery plug-
 
 Version 2.0 and greater of this gem sets a user's `employee_id` to the new UCPath employee id, rather than the legacy HCM employee id. If you need to use the older ID, use version 1.1.3 of this gem, or lower.
 
-## Upgrading to version 3.0 from version 2.x
+## Upgrading to version 3.0+ from version 2.x
 
 See [this wiki page](https://github.com/ucb-ist-eas/ucb_rails_user/wiki/Upgrading-to-version-3.0) for details.
 

data/app/assets/javascripts/ucb_rails_user/ucb_rails_user.js

@@ -18,11 +18,16 @@ var addDatatablesToSearchResults = function () {
 }
 
 var addDatatablesToUsersTable = function () {
+  var unsorted_columns = $('.ucb-rails-users-table th.unsorted').map((i, e) => $(e).index()).toArray()
+  if (unsorted_columns === []) {
+    var unsorted_columns = $(".ucb-rails-users-table th:contains('Edit'),.ucb-rails-users-table th:contains('Delete')").map((i, e) => $(e).index()).toArray()
+  }
+
   $('.ucb-rails-users-table').dataTable({
     searching: true,
     order: [[ 3, "asc" ]],
     columnDefs: [ {
-      targets: [8, 9],
+      targets: unsorted_columns,
       orderable: false
     }],
   })

data/app/controllers/ucb_rails_user/concerns/home_controller.rb

@@ -2,7 +2,7 @@ module UcbRailsUser::Concerns::HomeController
   extend ActiveSupport::Concern
 
   included do
-    skip_before_action :ensure_authenticated_user
+    skip_before_action :ensure_authenticated_user, raise: false
   end
 
   def index

data/app/controllers/ucb_rails_user/concerns/sessions_controller.rb

@@ -2,7 +2,7 @@ module UcbRailsUser::Concerns::SessionsController
   extend ActiveSupport::Concern
 
   included do
-    skip_before_action :ensure_authenticated_user, :log_request
+    skip_before_action :ensure_authenticated_user, :log_request, raise: false
   end
 
   # Redirects to authentication provider

data/app/controllers/ucb_rails_user/concerns/users_controller.rb

@@ -4,7 +4,7 @@ module UcbRailsUser::Concerns::UsersController
   included do
     before_action :find_user, :only => [:edit, :update, :destroy]
     before_action :ensure_admin_user
-    skip_before_action :ensure_admin_user, if: ->{ action_name == "toggle_superuser" && Rails.env.development? }
+    skip_before_action :ensure_admin_user, if: ->{ action_name == "toggle_superuser" && Rails.env.development? }, raise: false
   end
 
   def index
@@ -76,7 +76,7 @@ module UcbRailsUser::Concerns::UsersController
   def ldap_search
     # FIXME: this was retrofitted to support typeahead ajax json queries
     if(query = params[:query])
-      @lps_entries = UcbRails::OmniUserTypeahead.new.ldap_results(query)
+      @lps_entries = UcbRailsUser::OmniUserTypeahead.new.ldap_results(query)
       @lps_entries.map!{|entry|
         attrs = entry.attributes.tap{|attrs| attrs["first_last_name"] = "#{attrs['first_name']} #{attrs['last_name']}" }
         attrs.as_json
@@ -85,13 +85,14 @@ module UcbRailsUser::Concerns::UsersController
       render json: @lps_entries
 
     else
-      @lps_entries = UcbRails::LdapPerson::Finder.find_by_first_last(
+      @lps_entries = UcbRailsUser::LdapPerson::Finder.find_by_first_last(
         params.fetch(:first_name),
         params.fetch(:last_name),
         :sort => :last_first_downcase
       )
-      @lps_existing_uids = User.where(ldap_uid: @lps_entries.map(&:uid)).pluck(:uid)
-      render 'lps/search'
+      uid_strings = @lps_entries.map { |entry| entry.uid&.to_s }.compact
+      @lps_existing_uids = User.where(ldap_uid: uid_strings).pluck(:uid)
+      render 'ucb_rails_user/lps/search'
     end
 
   end

data/app/views/ucb_rails_user/users/index.html.haml

@@ -14,8 +14,8 @@
         %th.dt Last Login
         %th UID
         %th Employee ID
-        %th.min Edit
-        %th.min Delete
+        %th.min.unsorted Edit
+        %th.min.unsorted Delete
     %tbody.highlight
       = render partial: "ucb_rails_user/users/user", collection: @users
 

data/config/routes.rb

@@ -17,6 +17,8 @@ Rails.application.routes.draw do
     as: "admin_user_search", via: [:get]
   match "/admin/users/impersonate_search", to: UcbRailsUser::UsersController.action(:impersonate_search),
     as: "admin_user_impersonate_search", via: [:get]
+  match "/admin/users/ldap_search", to: UcbRailsUser::UsersController.action(:ldap_search),
+    as: "admin_user_ldap_search", via: [:get]
   resources :users, controller: "ucb_rails_user/users", path: "admin/users", as: :admin_users
 
   resources :impersonations, controller: "ucb_rails_user/impersonations", path: "admin/impersonations", as: :admin_impersonations

data/lib/ucb_rails_user/version.rb

@@ -1,3 +1,3 @@
 module UcbRailsUser
-  VERSION = '4.0.3'
+  VERSION = '4.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucb_rails_user
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.7
 platform: ruby
 authors:
 - Steve Downey
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails