diff --git a/scm-ui/src/groups/components/table/Details.js b/scm-ui/src/groups/components/table/Details.js index 3425e05427..ab8c1324ce 100644 --- a/scm-ui/src/groups/components/table/Details.js +++ b/scm-ui/src/groups/components/table/Details.js @@ -11,7 +11,9 @@ type Props = { class Details extends React.Component { - render() { + + render() { console.log(new Date('2011-04-11T10:20:30Z').toString()); + const { group, t } = this.props; return ( @@ -26,11 +28,11 @@ class Details extends React.Component { - + - + @@ -51,7 +53,7 @@ class Details extends React.Component {
{t("group.creationDate")}{group.creationDate}{new Date(group.creationDate).toString()}
{t("group.lastModified")}{group.lastModified}{new Date(group.lastModified).toString()}
{t("group.type")}{this.props.t("group.members")} - {this.props.group.members.map((member, index) => { + {this.props.group._embedded.members.map((member, index) => { return ; })}
diff --git a/scm-ui/src/groups/components/table/GroupMember.js b/scm-ui/src/groups/components/table/GroupMember.js index 342d698b24..d372a5075f 100644 --- a/scm-ui/src/groups/components/table/GroupMember.js +++ b/scm-ui/src/groups/components/table/GroupMember.js @@ -1,9 +1,10 @@ // @flow import React from "react"; import { Link } from "react-router-dom"; +import type {User} from "../../../users/types/User"; type Props = { - member: string + member: User }; export default class GroupMember extends React.Component { @@ -11,13 +12,22 @@ export default class GroupMember extends React.Component { return {label}; } + showName(to: any, member:User) { + if(member._links.self){ + return this.renderLink(to, member.name); + } + else { + return member.name + } + } + render() { const { member } = this.props; - const to = `/user/${member}`; + const to = `/user/${member.name}`; return (
- {this.renderLink(to, member)} + {this.showName(to, member)}