changes

app/controllers/user_controller.rb

@@ -71,21 +71,6 @@ class UserController < Users::ApplicationController
     end
   end
 
-  # POST /user/reject_join_request?user_id=1
-  def reject_join_request
-    render js: '' and return unless params[:user_id].present?
-    list && list.reject_join_request_for_user!(params[:user_id])
-    render js: ''
-  end
-
-  # POST /user/approve_join_request?user_id=1
-  def approve_join_request
-    render js: '' and return unless params[:user_id].present?
-    @user = User.find(params[:user_id])
-    list && list.approve_join_request_for_user!(@user)
-    render nothing: true
-  end
-
   # POST /user/check_table_join_status.json table_id:12345
   def check_table_join_status
     render json: json_alert('messages.table_not_found') and return unless params[:table_id].present?

app/controllers/users/lists_controller.rb

@@ -8,7 +8,7 @@ module Users
       #lists.reject!{|l| l.id == params[:exclude_list]} if params[:exclude_list].present?
       #lists.reject!{|l| l.id == current_user.active_list_id } if current_user && current_user.active_list_id.present? # see spec Loading lists and switching to the order products view works, lists loading may unlink active list orders
       lists.include_relation(:users, :supplier)
-      render json: JSONAPI::Serializer.serialize(lists, serializer: Users::ListSerializer, include: %w[supplier users], is_collection: true, meta: {total_pages: lists.total_count, page: lists.current_page}) #, root: :lists
+      render json: JSONAPI::Serializer.serialize(lists, serializer: Users::ListSerializer, include: %w[supplier users], is_collection: true, meta: {total_pages: lists.total_pages, page: lists.current_page}) #, root: :lists
     end
 
     #EMBER
@@ -27,7 +27,7 @@ module Users
     def show
       @list ||= List.find(params[:id]) if params[:id]
       render json: {}, status: :not_found and return unless @list.present? && Array.wrap(@list.user_ids).include?(current_user.id)
-      render json: JSONAPI::Serializer.serialize(@list, serializer: Users::ListSerializer, include: %w[supplier users])
+      render json: JSONAPI::Serializer.serialize(@list, serializer: Users::ListSerializer, include: %w[supplier users join_requests join_requests.list join_requests.user])
     end
 
     # POST /user/list_needs_payment.json
@@ -76,5 +76,20 @@ module Users
       render json: res
     end
 
+    # POST /user/reject_join_request?user_id=1
+    def reject_join_request
+      render js: '' and return unless params[:user_id].present?
+      active_list && active_list.reject_join_request_for_user!(params[:user_id])
+      head :ok
+    end
+
+    # POST /user/approve_join_request?user_id=1
+    def approve_join_request
+      render js: '' and return unless params[:user_id].present?
+      @user = User.find(params[:user_id])
+      active_list && active_list.approve_join_request_for_user!(@user)
+      head :ok
+    end
+
   end
 end