wip - calculating @all_contributors when displaying all ICLA signatures

nellshamrell · Feb 9, 2016 · 3543230 · 3543230
1 parent 6823998
commit 3543230
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/app/controllers/concerns/contributor_searching.rb b/app/controllers/concerns/contributor_searching.rb
@@ -9,7 +9,7 @@ def search_contributors(search_term)
   def all_contributors(search_term)
     # Finds the intersection between the users returned by the search
     # and the list of users who are authorized contributors
-    if search_term.empty?
+    if search_term.present?
       User.search(search_term) & User.authorized_contributors
     else
       User.authorized_contributors

diff --git a/app/controllers/contributors_controller.rb b/app/controllers/contributors_controller.rb
@@ -1,6 +1,6 @@
 class ContributorsController < ApplicationController
-  before_filter :find_contributor, only: [:update, :destroy]
   include ContributorSearching
+  before_filter :find_contributor, only: [:update, :destroy]
 
   #
   # PATCH /organizations/:organization_id/contributors/:id
@@ -43,7 +43,6 @@ def become_a_contributor
   # Display all of the users who are authorized to contribute
   #
   def index
-puts "FIRING"
     search_contributors(params[:contributors_q])
 
     # @all_contributors is set in ContributorSearching#search_contributors

diff --git a/app/controllers/icla_signatures_controller.rb b/app/controllers/icla_signatures_controller.rb
@@ -1,4 +1,5 @@
 class IclaSignaturesController < ApplicationController
+  include ContributorSearching
   before_filter :redirect_if_signed!, only: [:new, :create]
   before_filter :authenticate_user!, except: [:index, :agreement]
   before_filter :require_linked_github_account!, only: [:new, :create, :re_sign]
@@ -9,6 +10,7 @@ class IclaSignaturesController < ApplicationController
   # Displays a list of all users who have a signed ICLA.
   #
   def index
+    search_contributors(params[:contributors_q])
     @icla_signatures = IclaSignature.by_user.page(params[:page]).per(50)
   end
 

diff --git a/app/views/contributors/index.html.erb b/app/views/contributors/index.html.erb
@@ -33,7 +33,7 @@
           </tbody>
         </table>
 
-        <%= paginate @contributors %>
+        <%= paginate @all_contributors %>
       </div>
     </div>
   </div>