Merge pull request #121 from gate-sso/issue-#82

Issue #82 - Include inactive user as a checkbox on UI

app/assets/javascripts/group.coffee

@@ -3,6 +3,7 @@
 # You can use CoffeeScript in this file: http://coffeescript.org/
 
 group_ready = ->
+  $('#assign_admin_include_inactive_user').prop('checked', false);
   $('#assign_admin_user_id').selectize
     maxItems: 1
     valueField: 'id'
@@ -15,9 +16,13 @@ group_ready = ->
       if !query.length
         return callback()
 
+      # Clear the cache, because user list may change
+      this.clearOptions()
+      include_inactive = $('#assign_admin_include_inactive_user').is(':checked')
+
       # Use remote as source
       $.ajax
-        url: '/users/search?q=' + encodeURIComponent(query) 
+        url: '/users/search?q=' + encodeURIComponent(query) + '&include_inactive=' + include_inactive
         type: 'GET'
         error: ->
           callback()
@@ -30,6 +35,7 @@ group_ready = ->
   $('#assign_admin_user_id').on 'change', ->
     set_allow_submit($(this).val(), $(this))
 
+  $('#add_user_include_inactive_user').prop('checked', false);
   $('#add_user_user_id').selectize
     maxItems: 1
     valueField: 'id'
@@ -42,9 +48,13 @@ group_ready = ->
       if !query.length
         return callback()
 
+      # Clear the cache, because user list may change
+      this.clearOptions()
+      include_inactive = $('#add_user_include_inactive_user').is(':checked')
+
       # Use remote as source
       $.ajax
-        url: '/users/search?q=' + encodeURIComponent(query) 
+        url: '/users/search?q=' + encodeURIComponent(query) + '&include_inactive=' + include_inactive
         type: 'GET'
         error: ->
           callback()

app/controllers/users_controller.rb

@@ -51,9 +51,11 @@ def update
   def search
     @users = User.
       where("name LIKE :q OR email LIKE :q", q: "%#{params[:q]}%").
-      where(active: true).
       order("name ASC").
       limit(20)
+    unless params[:include_inactive] == 'true'
+      @users = @users.where(active: true)
+    end
     data = @users.map{ |user| {
       id: user.id,
       name: user.name,

app/views/groups/show.html.slim

@@ -26,6 +26,11 @@
               = text_field_tag "user_id", "", id: "assign_admin_user_id", class: "form-control"
             .col
               = submit_tag "Assign admin", class: "form-control btn btn-md btn-primary", disabled: true
+          .row
+            .col
+              = check_box_tag "assign_admin_include_inactive_user", "true", false
+              = " Include Inactive User"
+            .col
   a name="group_members"
   br
   .card
@@ -39,10 +44,13 @@
               th Email address
               th
           tbody
-            - @group.users.sort_by{ |user| user.email}.select{|user| user.active}.each do |user|
+            - @group.users.sort_by{ |user| user.email}.each do |user|
               tr
                 td
-                  = link_to "#{user.name}", user_path(user)
+                  - if user.active?
+                    = link_to "#{user.name}", user_path(user)
+                  - else
+                    = link_to "#{user.name} (inactive)", user_path(user)
                 td
                   = "#{user.email}"
                 td
@@ -61,7 +69,13 @@
               = text_field_tag "user_id", "", id: "add_user_user_id", class: "form-control"
             .col
               = submit_tag "Add User", class: "form-control btn-md btn-primary", disabled: true
-
+          .row
+            .col
+            .col
+            .col
+              = check_box_tag "add_user_include_inactive_user", "true", false
+              = " Include Inactive User"
+            .col
   br
   .card
     .card-body

spec/controllers/users_controller_spec.rb

@@ -43,14 +43,23 @@
   end
 
   describe 'Search for Users' do
-    it "should return active users according to supplied search string" do
+    it "should return only active users by default according to query" do
       sign_in user
       users = create_list(:user, 3)
       users.last.update(active: false)
       get :search, { q: users.first.name }
       returned_ids = JSON.parse(response.body).collect{|c| c['id']}
       expect(returned_ids).to eq([users.first.id])
     end
+
+    it "should return users according to query, if we supplied include_inactive params" do
+      sign_in user
+      users = create_list(:user, 3)
+      users.last.update(active: false)
+      get :search, { q: users.last.name, include_inactive: 'true' }
+      returned_ids = JSON.parse(response.body).collect{|c| c['id']}
+      expect(returned_ids).to eq([users.last.id])
+    end
   end
 
   describe "GET #regenerate_token" do