Merge pull request #420 from raminmjj/patch-1

ismcagdas · web-flow · commit e2266b82e708 · 2019-03-12T17:09:15.000+03:00
Users list: incorrect value in EmailAddress column
diff --git a/reactjs/src/scenes/Users/index.tsx b/reactjs/src/scenes/Users/index.tsx
@@ -115,7 +115,7 @@ class User extends AppComponentBase<IUserProps, IUserState> {
     const columns = [
       { title: L('UserName'), dataIndex: 'userName', key: 'userName', width: 150, render: (text: string) => <div>{text}</div> },
       { title: L('FullName'), dataIndex: 'name', key: 'name', width: 150, render: (text: string) => <div>{text}</div> },
-      { title: L('EmailAddress'), dataIndex: 'surname', key: 'surname', width: 150, render: (text: string) => <div>{text}</div> },
+      { title: L('EmailAddress'), dataIndex: 'emailAddress', key: 'emailAddress', width: 150, render: (text: string) => <div>{text}</div> },
       {
         title: L('IsActive'),
         dataIndex: 'isActive',

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ class User extends AppComponentBase<IUserProps, IUserState> {`
`115`	`115`	`const columns = [`
`116`	`116`	`{ title: L('UserName'), dataIndex: 'userName', key: 'userName', width: 150, render: (text: string) => <div>{text}</div> },`
`117`	`117`	`{ title: L('FullName'), dataIndex: 'name', key: 'name', width: 150, render: (text: string) => <div>{text}</div> },`
`118`		`- { title: L('EmailAddress'), dataIndex: 'surname', key: 'surname', width: 150, render: (text: string) => <div>{text}</div> },`
	`118`	`+ { title: L('EmailAddress'), dataIndex: 'emailAddress', key: 'emailAddress', width: 150, render: (text: string) => <div>{text}</div> },`
`119`	`119`	`{`
`120`	`120`	`title: L('IsActive'),`
`121`	`121`	`dataIndex: 'isActive',`