From e519f64b2e8dab657bfaf7406a23501d3bcce624 Mon Sep 17 00:00:00 2001
From: rlacko <rlacko@sch.bme.hu>
Date: Sun, 26 Jan 2020 22:07:07 +0100
Subject: [PATCH] News page shows full names and can change editor

---
 src/actions/auth.js                  | 3 ++-
 src/actions/news.js                  | 4 ++--
 src/components/forms/EditNewsForm.js | 4 ++--
 src/components/pages/News.js         | 8 +++++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/actions/auth.js b/src/actions/auth.js
index 5950df0..ce05047 100644
--- a/src/actions/auth.js
+++ b/src/actions/auth.js
@@ -13,6 +13,7 @@ export const getUserData = () => (
         motivation_about: motivationAbout,
         motivation_profession: motivationProfession,
         motivation_exercise: motivationExercise,
+        full_name,
         signed,
         groups,
         role,
@@ -36,7 +37,7 @@ export const getUserData = () => (
       dispatch({
         type: GET_USERDATA,
         payload: {
-          id, joinDate, nick, motivationAbout, motivationProfession, motivationExercise, signed, groups, role, permission
+          id, joinDate, nick, motivationAbout, motivationProfession, motivationExercise, full_name, signed, groups, role, permission
         },
       });
     } catch (e) {
diff --git a/src/actions/news.js b/src/actions/news.js
index 0a953af..525370c 100644
--- a/src/actions/news.js
+++ b/src/actions/news.js
@@ -39,11 +39,11 @@ export const postNews = ({ title, author, text }) => (
   }
 );
 
-export const editNews = ({ id, title, editedBy, text }) => (
+export const editNews = ({ id, title, text, updated_by}) => (
   async (dispatch) => {
     try {
       const response = await axios.patch(`/api/v1/news/${id}/`, {
-        author: editedBy,
+        updated_by,
         title,
         text,
       });
diff --git a/src/components/forms/EditNewsForm.js b/src/components/forms/EditNewsForm.js
index 7107e8d..1dad443 100644
--- a/src/components/forms/EditNewsForm.js
+++ b/src/components/forms/EditNewsForm.js
@@ -14,7 +14,7 @@ class EditNewsForm extends Component {
 
   render() {
     const { id, title, text } = this.props.selectedNews;
-    const editedBy = this.props.user.id;
+    const updated_by = this.props.user.id;
     return (
       <Modal
         open={this.state.showModal}
@@ -63,7 +63,7 @@ class EditNewsForm extends Component {
             color='green'
             onClick={() => {
                     this.props.editNews({
-                                       id, title, text, editedBy,
+                                       id, title, text, updated_by,
                                       });
                     this.setState({ showModal: false });
                     this.props.clearWrite();
diff --git a/src/components/pages/News.js b/src/components/pages/News.js
index 41260ea..807a914 100644
--- a/src/components/pages/News.js
+++ b/src/components/pages/News.js
@@ -29,7 +29,9 @@ class News extends Component {
               { this.props.user.role === 'Staff' ?
               <Grid.Column floated='right' width={4}>
                 <EditNewsForm
-                  onClick={() => this.props.setSelectedNews(item)}
+                  onClick={() => {
+                    this.props.setSelectedNews(item)
+                  }}
                 />
                 <Button
                   compact
@@ -54,9 +56,9 @@ class News extends Component {
                   <p> Szerkesztve: {moment(item.updated_at).format('LLLL')}</p>
                 </Grid.Column>
                 <Grid.Column floated='right' width={5}>
-                  <p> Írta: <strong>{item.author_name}</strong></p>
+                  <p> Írta: <strong>{item.author}</strong></p>
                   {/* TODO get the edited by name */}
-                  <p> Szerkesztette: {item.author_name}</p>
+                  <p> Szerkesztette: {item.last_update_by}</p>
                 </Grid.Column>
               </Grid.Row>
             </Grid>
-- 
GitLab