[ARVADOS-WORKBENCH2] updated: 1.3.0-267-gdb2c87fb
Git user
git at public.curoverse.com
Thu Dec 27 08:28:40 EST 2018
Summary of changes:
src/store/users/users-actions.ts | 1 +
src/views-components/user-dialog/manage-dialog.tsx | 16 ++++++----------
2 files changed, 7 insertions(+), 10 deletions(-)
via db2c87fbe29eed8c4bfca47a97c97cee77959d58 (commit)
from 80925b518233f7ef75615917a1e3503b2e9a7874 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit db2c87fbe29eed8c4bfca47a97c97cee77959d58
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Thu Dec 27 14:28:25 2018 +0100
refs #14565-fix
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/store/users/users-actions.ts b/src/store/users/users-actions.ts
index b7944524..71fd107b 100644
--- a/src/store/users/users-actions.ts
+++ b/src/store/users/users-actions.ts
@@ -133,3 +133,4 @@ export const loadUsersPanel = () =>
(dispatch: Dispatch) => {
dispatch(userBindedActions.REQUEST_ITEMS());
};
+
\ No newline at end of file
diff --git a/src/views-components/user-dialog/manage-dialog.tsx b/src/views-components/user-dialog/manage-dialog.tsx
index 5b69dcbe..59779928 100644
--- a/src/views-components/user-dialog/manage-dialog.tsx
+++ b/src/views-components/user-dialog/manage-dialog.tsx
@@ -12,7 +12,6 @@ import { compose, Dispatch } from "redux";
import { USER_MANAGEMENT_DIALOG, openSetupShellAccount, loginAs } from "~/store/users/users-actions";
import { UserResource } from "~/models/user";
import { connect } from "react-redux";
-import { ApiClientAuthorization } from '~/models/api-client-authorization';
type CssRules = 'spacing';
@@ -24,10 +23,7 @@ const styles = withStyles<CssRules>((theme: ArvadosTheme) => ({
}));
interface UserManageDataProps {
- data: {
- user: UserResource;
- client: ApiClientAuthorization;
- };
+ data: UserResource;
}
interface UserManageActionProps {
@@ -51,19 +47,19 @@ export const UserManageDialog = compose(
onClose={props.closeDialog}
fullWidth
maxWidth="md">
- <DialogTitle>{`Manage - ${props.data.user.firstName} ${props.data.user.lastName}`}</DialogTitle>
+ <DialogTitle>{`Manage - ${props.data.firstName} ${props.data.lastName}`}</DialogTitle>
<DialogContent>
<Typography variant="body2" className={props.classes.spacing}>
As an admin, you can log in as this user. When you’ve finished, you will need to log out and log in again with your own account.
</Typography>
- <Button variant="contained" color="primary" onClick={() => props.loginAs(props.data.client.uuid)}>
- {`LOG IN AS ${props.data.user.firstName} ${props.data.user.lastName}`}
+ <Button variant="contained" color="primary" onClick={() => props.loginAs(props.data.createdAt)}>
+ {`LOG IN AS ${props.data.firstName} ${props.data.lastName}`}
</Button>
<Typography variant="body2" className={props.classes.spacing}>
As an admin, you can setup a shell account for this user. The login name is automatically generated from the user's e-mail address.
</Typography>
- <Button variant="contained" color="primary" onClick={() => props.openSetupShellAccount(props.data.user.uuid)}>
- {`SETUP SHELL ACCOUNT FOR ${props.data.user.firstName} ${props.data.user.lastName}`}
+ <Button variant="contained" color="primary" onClick={() => props.openSetupShellAccount(props.data.uuid)}>
+ {`SETUP SHELL ACCOUNT FOR ${props.data.firstName} ${props.data.lastName}`}
</Button>
</DialogContent>
<DialogActions>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list