ucb_rails_user 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dc5620499c364c14d79ea1c8da21d420617fc235
-  data.tar.gz: b801bf9e74db566224e301efc79744ca0fc9b774
+SHA256:
+  metadata.gz: c9b7c60383d3c2173a957728803d3be316b4453b384eaecad89bc17ccfccdeb0
+  data.tar.gz: 0c00722b9525c583b4bf42015ddd62a63b3cdfa0e5732d4fa52cb779fbea7466
 SHA512:
-  metadata.gz: 493ed7ef342b66b11c8e36b23b4a7d1087defc96108059994678702d734a849308c19f8030e43f22eb28bd02387f70d5ff2dfce24e9dc7bcab2d587edc211f77
-  data.tar.gz: 70bf635518c74e56f5e8c3edb992a8328278232274315f5512fcb0838346160279322a5ee7c015dff3e5d4d4feb3d6367103cde3ee67cfdc85616106412c240b
+  metadata.gz: 042e3bf99202395403a49c369c1dbd63ee5c4abf19d7db6bab46a578be83bd8894e3fd2af80fc59bc64b3fce1e566221eafa96d139ae02a25666bf0f4be0c7f6
+  data.tar.gz: e3285e5db0c2262f6b4efc61a78a8c20db0b776380faa12bda776dbfddb81712e583d6d1ac5ae1c716efb16c47bb1992f2a7fcb288491bd9fe2e8d6057bebc67

data/app/helpers/ucb_rails_user/users_helper.rb

@@ -14,5 +14,8 @@ module UcbRailsUser
       )
     end
 
+    def checkmark(bool, true_string="✔".html_safe, false_string=' '.html_safe)
+      bool ? true_string : false_string
+    end
   end
 end

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

@@ -4,11 +4,11 @@
   = f.input :last_name, :input_html => {disabled: 'disabled'}
   = f.input :email, :input_html => {disabled: 'disabled'}
   = f.input :alternate_email
-  = f.input :last_login_at, as: :string, :input_html => {disabled: 'disabled', value: datetime_to_s(@user.last_login_at, :long)}
+  = f.input :last_login_at, as: :string, :input_html => {disabled: 'disabled', value: @user.last_login_at&.strftime("%m/%d/%Y %H:%M:%S")}
   = f.input :superuser_flag, :as => :boolean, label: "Superuser?", wrapper: :horizontal_boolean
   = f.input :inactive_flag, :as => :boolean, :label => "Inactive User?", wrapper: :horizontal_boolean
 
-  = form_actions do
-    = submit_button_tag("Update User")
-    = cancel_button_tag(url: admin_users_path)
+  .form-actions
+    %button{type: "submit", class: "btn btn-primary"} Submit
+    = link_to "Cancel", admin_users_path
 

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

@@ -1,10 +1,10 @@
 %tr[user]
-  = td_bln(user.superuser?)
-  = td_bln(user.inactive?)
+  %td= checkmark(user.superuser?)
+  %td= checkmark(user.inactive?)
   %td= user.first_name
   %td= user.last_name
   %td= mail_to(user.email)
-  %td.dt= datetime_to_s(user.last_login_at, :long)
+  %td.dt= user.last_login_at&.strftime("%m/%d/%Y %H:%M:%S")
   %td.min= user.ldap_uid
   %td.min= user.employee_id
   %td= link_to('edit', edit_admin_user_path(user), :class => 'btn btn-default btn-xs', :id => dom_id(user, 'edit'))

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

@@ -2,20 +2,21 @@
   %h1
     Users
 
-%table.table.table-striped.table-bordered.table-hover.ucb-rails-users-table
-  %thead
-    %tr
-      %th.min Superuser?
-      %th.min Inactive?
-      %th First Name
-      %th Last Name
-      %th Email
-      %th.dt Last Login
-      %th UID
-      %th Employee ID
-      %th.min Edit
-      %th.min Delete
-  %tbody.highlight
-    = render partial: "ucb_rails_user/users/user", collection: @users
+.table-responsive
+  %table.table.table-striped.table-bordered.table-hover.ucb-rails-users-table
+    %thead
+      %tr
+        %th.min Superuser?
+        %th.min Inactive?
+        %th First Name
+        %th Last Name
+        %th Email
+        %th.dt Last Login
+        %th UID
+        %th Employee ID
+        %th.min Edit
+        %th.min Delete
+    %tbody.highlight
+      = render partial: "ucb_rails_user/users/user", collection: @users
 
 

data/lib/ucb_rails_user.rb

@@ -8,9 +8,6 @@ require "omniauth-cas"
 require "ucb_ldap"
 require "active_attr"
 
-require "bootstrap-view-helpers"
-#require "rails_view_helpers"
-
 module UcbRailsUser
 
   def self.logger

data/lib/ucb_rails_user/version.rb

@@ -1,3 +1,3 @@
 module UcbRailsUser
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucb_rails_user
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Steve Downey
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -139,20 +139,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: bootstrap-view-helpers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.14
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.14
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -271,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Rails engine for UCB user accounts