rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-21 15:54:22 +01:00
Code Issues Releases Activity

do not retrieve full users list on plans page

Browse Source
This commit is contained in:
Sylvain 2016-06-16 14:26:10 +02:00
parent c30b43f14a
commit ddbb043a41
4 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/controllers/plans.coffee.erb
View File

@ -35,7 +35,7 @@ Application.Controllers.controller "PlansIndexController", ["$scope", "$rootScop
## plan to subscribe (shopping cart) ## plan to subscribe (shopping cart)
$scope.selectedPlan = null $scope.selectedPlan = null
## ## text that appears in the bottom-right box of the page (subscriptions rules details)
$scope.subscriptionExplicationsAlert = subscriptionExplicationsPromise.setting.value $scope.subscriptionExplicationsAlert = subscriptionExplicationsPromise.setting.value
## ##
@ -146,12 +146,6 @@ Application.Controllers.controller "PlansIndexController", ["$scope", "$rootScop
$scope.ctrl.member = $scope.currentUser $scope.ctrl.member = $scope.currentUser
$scope.paidPlan = $scope.currentUser.subscribed_plan $scope.paidPlan = $scope.currentUser.subscribed_plan
$scope.group.id = $scope.currentUser.group_id $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.$on 'devise:new-session', (event, user)->
$scope.ctrl.member = user $scope.ctrl.member = user

4
app/assets/javascripts/services/member.coffee
View File

@ -19,7 +19,7 @@ Application.Services.factory 'Member', ["$resource", ($resource)->
isArray: true isArray: true
search: search:
method: 'GET' method: 'GET'
url: '/api/members/search/:query/:subscription' url: '/api/members/search/:query'
params: {query: "@query", subscription: "@subscription"} params: {query: "@query"}
isArray: true isArray: true
] ]

5
app/controllers/api/members_controller.rb
View File

@ -180,11 +180,6 @@ class API::MembersController < API::ApiController
end end
def search def search
if params[:subscription]
subscription = (params[:subscription] === 'true')
end
@members = User.includes(:profile) @members = User.includes(:profile)
.joins(:profile, :roles, 'LEFT JOIN "subscriptions" ON "subscriptions"."user_id" = "users"."id"') .joins(:profile, :roles, 'LEFT JOIN "subscriptions" ON "subscriptions"."user_id" = "users"."id"')
.where("users.is_active = 'true' AND roles.name = 'member'") .where("users.is_active = 'true' AND roles.name = 'member'")

2
config/routes.rb
View File

@ -41,7 +41,7 @@ Rails.application.routes.draw do
get '/export_members', action: 'export_members', on: :collection get '/export_members', action: 'export_members', on: :collection
put ':id/merge', action: 'merge', on: :collection put ':id/merge', action: 'merge', on: :collection
post 'list', action: 'list', on: :collection post 'list', action: 'list', on: :collection
get 'search/:query(/:subscription)', action: 'search', on: :collection get 'search/:query', action: 'search', on: :collection
end end
resources :reservations, only: [:show, :create, :index, :update] resources :reservations, only: [:show, :create, :index, :update]
resources :notifications, only: [:index, :show, :update] do resources :notifications, only: [:index, :show, :update] do