From b5e432c7646076dea1101ccaaf699cdff4c5fee3 Mon Sep 17 00:00:00 2001 From: Andrew Watkins Date: Thu, 9 Mar 2017 14:37:42 -0800 Subject: [PATCH] Change order of arguments --- ui/src/admin/actions/index.js | 4 ++-- ui/src/admin/components/RoleRow.js | 4 ++-- ui/src/admin/containers/AdminPage.js | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ui/src/admin/actions/index.js b/ui/src/admin/actions/index.js index ac67b946b..13d489e4b 100644 --- a/ui/src/admin/actions/index.js +++ b/ui/src/admin/actions/index.js @@ -146,7 +146,7 @@ export const deleteUserAsync = (user, addFlashMessage) => (dispatch) => { deleteUserAJAX(user.links.self, addFlashMessage, user.name) } -export const updateRoleUsersAsync = (users, role) => async (dispatch) => { +export const updateRoleUsersAsync = (role, users) => async (dispatch) => { try { await updateRoleUsersAJAX(role.links.self, users) dispatch(publishNotification('success', 'Role users updated')) @@ -155,7 +155,7 @@ export const updateRoleUsersAsync = (users, role) => async (dispatch) => { } } -export const updateRolePermissionsAsync = (permissions, role) => async (dispatch) => { +export const updateRolePermissionsAsync = (role, permissions) => async (dispatch) => { try { await updateRolePermissionsAJAX(role.links.self, permissions) dispatch(publishNotification('success', 'Role permissions updated')) diff --git a/ui/src/admin/components/RoleRow.js b/ui/src/admin/components/RoleRow.js index 0232ebdc3..129874a88 100644 --- a/ui/src/admin/components/RoleRow.js +++ b/ui/src/admin/components/RoleRow.js @@ -35,11 +35,11 @@ const RoleRow = ({ onUpdateRolePermissions, }) => { const handleUpdateUsers = (u) => { - onUpdateRoleUsers(u.map((n) => ({name: n})), role) + onUpdateRoleUsers(role, u.map((n) => ({name: n}))) } const handleUpdatePermissions = (allowed) => { - onUpdateRolePermissions([{scope: 'all', allowed}], role) + onUpdateRolePermissions(role, [{scope: 'all', allowed}]) } const perms = _.get(permissions, ['0', 'allowed'], []) diff --git a/ui/src/admin/containers/AdminPage.js b/ui/src/admin/containers/AdminPage.js index 1729ba120..280a4b768 100644 --- a/ui/src/admin/containers/AdminPage.js +++ b/ui/src/admin/containers/AdminPage.js @@ -80,12 +80,12 @@ class AdminPage extends Component { this.props.deleteUser(user, this.props.addFlashMessage) } - handleUpdateRoleUsers(users, role) { - this.props.updateRoleUsers(users, role) + handleUpdateRoleUsers(role, users) { + this.props.updateRoleUsers(role, users) } - handleUpdateRolePermissions(permissions, role) { - this.props.updateRolePermissions(permissions, role) + handleUpdateRolePermissions(role, permissions) { + this.props.updateRolePermissions(role, permissions) } render() {