Merge 6653e59 into 79d9797

ManageIQ-Exchange · Feb 13, 2018 · 00cc788 · 00cc788
2 parents 79d9797 + 6653e59
commit 00cc788
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/app/controllers/v1/api_controller/metadata.rb b/app/controllers/v1/api_controller/metadata.rb
@@ -4,13 +4,6 @@ class ApiController
     # Metadata request module
     #
     ##
-=begin
-  @apiDefine Pagination Pagination
-  @apiSuccess {Object} meta Metadata
-  @apiSuccess {Integer} meta.current_page Current page in pagination
-  @apiSuccess {Integer} meta.total_pages Total number of pages
-  @apiSuccess {Integer} meta.total_count Total number of elements
-=end
     module Metadata
       # Generate metadata information for request.
       #

diff --git a/app/controllers/v1/api_controller/pagination.rb b/app/controllers/v1/api_controller/pagination.rb
@@ -4,6 +4,14 @@ class ApiController
     # Pagination request module
     #
     ##
+=begin
+  @apiDefine Pagination Pagination
+  @apiSuccess {Object} meta Meta
+  @apiSuccess {Integer} meta.pagination.current_page Current page in pagination
+  @apiSuccess {Integer} meta.pagination.total_pages Total number of pages
+  @apiSuccess {Integer} meta.pagination.total_count Total number of elements
+  @apiVersion 1.0.0
+=end
     module Pagination
       # Get the specific page collection with limit option.
       #

diff --git a/app/controllers/v1/users_controller.rb b/app/controllers/v1/users_controller.rb
@@ -85,7 +85,7 @@ def index
   @apiError (No Content 404) {String} UserNotFound.title Error title
   @apiError (No Content 404) {String} UserNotFound.Detail Additional detail on error
   @apiError (No Content 404) {Object} UserNotFound.extra
-  @apiError (No Content 404) {String} UserNotFound.extra.username User ID
+  @apiError (No Content 404) {String} UserNotFound.extra.username User ID requested
 
   @apiErrorExample {json} User not found
 {
@@ -101,7 +101,7 @@ def index
     def show
       return unless  check_params_required(:id)
       logger.debug "Looking for user with github_login #{params[:id]}"
-      @user = User.find_by(id: params[:id]) || User.find_by(github_login: params[:id])
+      @user = User.find_by('id= ? OR github_login= ?', params[:id], params[:id])
       if @user
         return_response @user, :ok
       else