mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-02-19 13:54:25 +01:00
do not retrieve full users list on plans page
This commit is contained in:
parent
c30b43f14a
commit
ddbb043a41
@ -35,7 +35,7 @@ Application.Controllers.controller "PlansIndexController", ["$scope", "$rootScop
|
||||
## plan to subscribe (shopping cart)
|
||||
$scope.selectedPlan = null
|
||||
|
||||
##
|
||||
## text that appears in the bottom-right box of the page (subscriptions rules details)
|
||||
$scope.subscriptionExplicationsAlert = subscriptionExplicationsPromise.setting.value
|
||||
|
||||
##
|
||||
@ -146,12 +146,6 @@ Application.Controllers.controller "PlansIndexController", ["$scope", "$rootScop
|
||||
$scope.ctrl.member = $scope.currentUser
|
||||
$scope.paidPlan = $scope.currentUser.subscribed_plan
|
||||
$scope.group.id = $scope.currentUser.group_id
|
||||
else
|
||||
Member.query {requested_attributes:'[subscription]'}, (members) ->
|
||||
membersNoPlan = []
|
||||
angular.forEach members, (v)->
|
||||
membersNoPlan.push v unless v.subscribed_plan
|
||||
$scope.members = membersNoPlan
|
||||
|
||||
$scope.$on 'devise:new-session', (event, user)->
|
||||
$scope.ctrl.member = user
|
||||
|
@ -19,7 +19,7 @@ Application.Services.factory 'Member', ["$resource", ($resource)->
|
||||
isArray: true
|
||||
search:
|
||||
method: 'GET'
|
||||
url: '/api/members/search/:query/:subscription'
|
||||
params: {query: "@query", subscription: "@subscription"}
|
||||
url: '/api/members/search/:query'
|
||||
params: {query: "@query"}
|
||||
isArray: true
|
||||
]
|
||||
|
@ -180,11 +180,6 @@ class API::MembersController < API::ApiController
|
||||
end
|
||||
|
||||
def search
|
||||
|
||||
if params[:subscription]
|
||||
subscription = (params[:subscription] === 'true')
|
||||
end
|
||||
|
||||
@members = User.includes(:profile)
|
||||
.joins(:profile, :roles, 'LEFT JOIN "subscriptions" ON "subscriptions"."user_id" = "users"."id"')
|
||||
.where("users.is_active = 'true' AND roles.name = 'member'")
|
||||
|
@ -41,7 +41,7 @@ Rails.application.routes.draw do
|
||||
get '/export_members', action: 'export_members', on: :collection
|
||||
put ':id/merge', action: 'merge', on: :collection
|
||||
post 'list', action: 'list', on: :collection
|
||||
get 'search/:query(/:subscription)', action: 'search', on: :collection
|
||||
get 'search/:query', action: 'search', on: :collection
|
||||
end
|
||||
resources :reservations, only: [:show, :create, :index, :update]
|
||||
resources :notifications, only: [:index, :show, :update] do
|
||||
|
Loading…
x
Reference in New Issue
Block a user