raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure userSelect directive uses our Admin::UserSerializer instead of base Spree api view

Browse Source
This commit is contained in:
Matt-Yorkley
2018-02-01 16:56:55 +00:00
committed by Rob Harrington
parent ec5ce45850
commit b893dea810
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
View File

@@ -46,6 +46,7 @@ angular.module("admin.enterprises")
manager =
id: manager.id
email: manager.email
confirmed: manager.confirmed
if (user for user in $scope.Enterprise.users when user.id == manager.id).length == 0
$scope.Enterprise.users.push manager
else

2
app/controllers/spree/admin/search_controller_decorator.rb
View File

@@ -13,7 +13,7 @@ Spree::Admin::SearchController.class_eval do
}).result.limit(10)
end
render :users
render json: @users, each_serializer: Api::Admin::UserSerializer
end
def customers

20
spec/javascripts/unit/admin/enterprises/controllers/enterprise_controller_spec.js.coffee
View File

@@ -35,29 +35,29 @@ describe "enterpriseCtrl", ->
describe "adding managers", ->
u1 = u2 = u3 = null
beforeEach ->
u1 = { id: 1, email: 'name1@email.com' }
u2 = { id: 2, email: 'name2@email.com' }
u3 = { id: 3, email: 'name3@email.com' }
u1 = { id: 1, email: 'name1@email.com', confirmed: true }
u2 = { id: 2, email: 'name2@email.com', confirmed: true }
u3 = { id: 3, email: 'name3@email.com', confirmed: true }
enterprise.users = [u1, u2 ,u3]
it "adds a user to the list", ->
u4 = { id: 4, email: "name4@email.com" }
u4 = { id: 4, email: "name4@email.com", confirmed: true }
scope.addManager u4
expect(enterprise.users).toContain u4
it "ignores object without an id", ->
u4 = { not_id: 4, email: "name4@email.com" }
u4 = { not_id: 4, email: "name4@email.com", confirmed: true }
scope.addManager u4
expect(enterprise.users).not.toContain u4
it "it ignores objects without an email", ->
u4 = { id: 4, not_email: "name4@email.com" }
u4 = { id: 4, not_email: "name4@email.com", confirmed: true }
scope.addManager u4
expect(enterprise.users).not.toContain u4
it "ignores objects that are already in the list, and alerts the user", ->
spyOn(window, "alert").and.callThrough()
u4 = { id: 3, email: "email-doesn't-matter.com" }
u4 = { id: 3, email: "email-doesn't-matter.com", confirmed: true }
scope.addManager u4
expect(enterprise.users).not.toContain u4
expect(window.alert).toHaveBeenCalledWith "email-doesn't-matter.com is already a manager!"
@@ -66,9 +66,9 @@ describe "enterpriseCtrl", ->
describe "removing managers", ->
u1 = u2 = u3 = null
beforeEach ->
u1 = { id: 1, email: 'name1@email.com' }
u2 = { id: 2, email: 'name2@email.com' }
u3 = { id: 3, email: 'name3@email.com' }
u1 = { id: 1, email: 'name1@email.com', confirmed: true }
u2 = { id: 2, email: 'name2@email.com', confirmed: true }
u3 = { id: 3, email: 'name3@email.com', confirmed: true }
enterprise.users = [u1, u2 ,u3]