ucb_rails_user 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22dfe957a0a20c8e4d3d0696e8deabb8e2c1080cbb6bf20cce37dd8ec60c29c2
-  data.tar.gz: a63c08a5433c35ef7cb9de21b86411d660315f6300acf777ab76b3c83acef3aa
+  metadata.gz: 2aa06951596331c10cc4488247690be7789b983bcd75d0dfbaf7848f339f2fce
+  data.tar.gz: 4fbb826d46c63e76db14a21d32ea155bc8f87db5c20798b9d345ecc2a2d91456
 SHA512:
-  metadata.gz: da3cedb8edd90425af6d8e0bb3d700bc1aa560ff1f76072bf6809b070c383f06956bf676fdbb4a8f6d2408d5562ac053ae545e5e69e76b4480bc292af7d03323
-  data.tar.gz: e899dd9644a2f493233a7891ed188b500fcd5b793f46ce0c453b652b82ed6de9cb72181e913dcf7c2c08cb990ede6c7407e3e1cebbccca373a8f14b6ad0a4dee
+  metadata.gz: 91219b59d56af936ec69898ee7b94776e34ca21e8662450c6c75a28146ae4ca06adcd683a8426976bcdb1f0c57f505eb8243a141d8eec9ba201bd3b6eb666032
+  data.tar.gz: 58db7b4561be2a9cbb538cd8fbc2236ff60e508318ad016a091a209fbb1c6b3bb4725a2e2864b03c029a485f7cc3a6b640bffc3da995151628abbe925be33687

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

@@ -67,6 +67,7 @@ $( window ).on("load", function() {
     name: 'users',
     source: usersSource,
     display: 'name',
+    limit: 7, // any higher than this, and the results don't display properly
     templates: {
       empty: [
         '<div class="empty-message">',
@@ -74,7 +75,7 @@ $( window ).on("load", function() {
         '</div>'
       ].join('\n'),
       suggestion: function (data) {
-        return '<div><strong>' + data.name + '</strong></div>'
+        return '<div><strong>' + data.name + '</strong> (' + data.uid + ')</div>'
       }
     }
   });

data/app/assets/stylesheets/ucb_rails_user/components/_impersonations.sass

@@ -4,6 +4,7 @@
 
 .recent-impersonations
   margin-top: 24px
+  padding-bottom: 200px
 
   ul
     padding-left: 0px

data/app/assets/stylesheets/ucb_rails_user/typeahead_tweaks.sass

@@ -8,25 +8,6 @@
 .twitter-typeahead
     display: block !important
 
-.tt-hint
-    display: block
-    width: 100%
-    height: 38px
-    margin-top: -2px
-    padding: 8px 12px
-    font-size: 14px
-    line-height: 1.428571429
-    color: #999
-    vertical-align: middle
-    background-color: #ffffff
-    border: 1px solid #cccccc
-    border-radius: 4px
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075)
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075)
-    -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s
-    transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s
-
-
 .tt-menu
     // make this wide enough to accomodate the org unit code and name
     width: 400px
@@ -41,26 +22,21 @@
     box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175)
     background-clip: padding-box
 
-
 .tt-suggestion
     display: block
     padding: 3px 20px
     width: 100%
 
-
 .tt-suggestion.tt-selectable
     margin: 5px 0px 5px 0px
 
-
 .tt-suggestion.tt-cursor
     color: #fff
     background-color: #428bca
 
-
 .tt-suggestion.tt-cursor a
     color: #fff
 
-
 .tt-suggestion p
     margin: 0
 

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

@@ -28,7 +28,7 @@ module UcbRailsUser::Concerns::UsersController
 
   def impersonate_search
     result = UcbRailsUser::UserSearch.find_users_by_name(params[:q])
-    render json: result.map { |u| { name: u.full_name, id: u.id } }
+    render json: result.map { |u| { name: u.full_name, id: u.id, uid: u.ldap_uid } }
   end
 
   def edit
@@ -113,8 +113,8 @@ module UcbRailsUser::Concerns::UsersController
 
   private
 
-  def user_params
-    params.require(:user).permit(
+  def user_params(extra_params = [])
+    params.require(:user).permit([
       :superuser_flag,
       :inactive_flag,
       :first_name,
@@ -125,7 +125,7 @@ module UcbRailsUser::Concerns::UsersController
       :last_request_at,
       :last_logout_at,
       :last_login_at,
-      :uid
+      :uid] + extra_params
     )
   end
 

data/app/helpers/ucb_rails_user/users_helper.rb

@@ -17,5 +17,10 @@ module UcbRailsUser
     def checkmark(bool, true_string="✔".html_safe, false_string=' '.html_safe)
       bool ? true_string : false_string
     end
+
+    def full_name_with_uid(user)
+      return "" unless user.present?
+      "#{user.full_name} (#{user.ldap_uid})"
+    end
   end
 end

data/app/models/ucb_rails_user/user_search.rb

@@ -2,21 +2,20 @@ module UcbRailsUser::UserSearch
 
   def self.find_users_by_name(name)
     return [] unless name.present?
-    (name1, name2) = name.split
-    query = case_insenstive(:first_name, name1)
-      .or(case_insenstive(:last_name, name1))
-    if name2.present?
-      query = query
-        .or(case_insenstive(:first_name, name2))
-        .or(case_insenstive(:last_name, name2))
-    end
+    (name1, name2) = name
+      .downcase
+      .split
+      .take(2)
+      .reject { |n| n.blank? }
+      .map { |n| "#{n}%" }
+    query =
+      if name1.present? && name2.present?
+        User.where("LOWER(first_name) LIKE ? AND LOWER(last_name) LIKE ?", name1, name2)
+          .or(User.where("LOWER(last_name) LIKE ? AND LOWER(first_name) LIKE ?", name1, name2))
+      else
+        User.where("LOWER(first_name) LIKE ? OR LOWER(last_name) LIKE ?", name1, name1)
+      end
     query.order(:last_name, :first_name)
   end
 
-  private
-
-  def self.case_insenstive(column, value)
-    User.where("LOWER(#{column}) = ?", value.downcase)
-  end
-
 end

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

@@ -15,6 +15,6 @@
     %h3 Recent impersonations
     %ul
       - current_user.recent_impersonations.each do |imp|
-        %li= link_to imp.target.full_name, admin_impersonations_path() + "?ucb_rails_user_impersonation[target_id=#{imp.target.id}]", method: :post
+        %li= link_to full_name_with_uid(imp.target), admin_impersonations_path() + "?ucb_rails_user_impersonation[target_id=#{imp.target.id}]", method: :post
   - else
     %h4 No recent impersonations

data/lib/ucb_rails_user/version.rb

@@ -1,3 +1,3 @@
 module UcbRailsUser
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucb_rails_user
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Steve Downey
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-17 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -370,7 +370,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Rails engine for UCB user accounts