From 01a494ac233009f7bb63c40d3028a5e7b02bb22d Mon Sep 17 00:00:00 2001
From: Maxi Redigonda <maxiredigonda@gmail.com>
Date: Wed, 5 Aug 2020 16:34:27 -0300
Subject: [PATCH 1/2] Fixes /system/get-logs by adding getFetchAs

---
 server/models/Log.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/server/models/Log.php b/server/models/Log.php
index 88eabd62..b21e0a47 100755
--- a/server/models/Log.php
+++ b/server/models/Log.php
@@ -27,6 +27,13 @@ class Log extends DataStore {
         ];
     }
 
+    public static function getFetchAs() {
+        return [
+            'authorUser' => 'user',
+            'authorStaff' => 'staff',
+        ];
+    }
+
     public static function createLog($type, $to, $author = null) {
         $session = Session::getInstance();
         $authorName = '';

From 1c5d15672381fb0196dede1479f42c41e183d13d Mon Sep 17 00:00:00 2001
From: LautaroCesso <59095036+LautaroCesso@users.noreply.github.com>
Date: Fri, 7 Aug 2020 17:29:24 -0300
Subject: [PATCH 2/2] Delete non existent step 7 instalation (#862)

* Delete non existent step 7 instalation

* Add INSTALLATION_COMPLETED_TITLE i18n and delete INSTALLATION_COMPLETED.
---
 client/src/app/Routes.js                               |  4 ++--
 ...nstall-step-7-completed.js => install-completed.js} | 10 ++++------
 ...ll-step-7-completed.scss => install-completed.scss} |  0
 client/src/app/install/install-step-1-language.js      |  2 +-
 client/src/app/install/install-step-2-requirements.js  |  2 +-
 client/src/app/install/install-step-3-database.js      |  2 +-
 client/src/app/install/install-step-4-user-system.js   |  2 +-
 client/src/app/install/install-step-5-settings.js      |  2 +-
 client/src/app/install/install-step-6-admin.js         |  4 ++--
 client/src/data/languages/en.js                        |  3 +--
 10 files changed, 14 insertions(+), 17 deletions(-)
 rename client/src/app/install/{install-step-7-completed.js => install-completed.js} (57%)
 rename client/src/app/install/{install-step-7-completed.scss => install-completed.scss} (100%)

diff --git a/client/src/app/Routes.js b/client/src/app/Routes.js
index f764f405..088526fd 100644
--- a/client/src/app/Routes.js
+++ b/client/src/app/Routes.js
@@ -61,7 +61,7 @@ import InstallStep3Database from 'app/install/install-step-3-database';
 import InstallStep4UserSystem from 'app/install/install-step-4-user-system';
 import InstallStep5Settings from 'app/install/install-step-5-settings';
 import InstallStep6Admin from 'app/install/install-step-6-admin';
-import InstallStep7Completed from 'app/install/install-step-7-completed';
+import InstallCompleted from 'app/install/install-completed';
 
 export default (
     <Router history={history}>
@@ -98,7 +98,7 @@ export default (
                 <Route path="step-4" component={InstallStep4UserSystem} />
                 <Route path="step-5" component={InstallStep5Settings} />
                 <Route path="step-6" component={InstallStep6Admin} />
-                <Route path="step-7" component={InstallStep7Completed} />
+                <Route path="completed" component={InstallCompleted} />
             </Route>
             <Route path="admin">
                 <IndexRoute component={AdminLoginPage} />
diff --git a/client/src/app/install/install-step-7-completed.js b/client/src/app/install/install-completed.js
similarity index 57%
rename from client/src/app/install/install-step-7-completed.js
rename to client/src/app/install/install-completed.js
index c0a49475..4fa7b56e 100644
--- a/client/src/app/install/install-step-7-completed.js
+++ b/client/src/app/install/install-completed.js
@@ -4,10 +4,9 @@ import store from 'app/store';
 import ConfigActions from 'actions/config-actions';
 import i18n from 'lib-app/i18n';
 
-import Header from 'core-components/header';
 import Message from 'core-components/message';
 
-class InstallStep7Completed extends React.Component {
+class InstallCompleted extends React.Component {
 
     componentDidMount() {
         store.dispatch(ConfigActions.init());
@@ -19,9 +18,8 @@ class InstallStep7Completed extends React.Component {
 
     render() {
         return (
-            <div className="install-step-7">
-                <Header title={i18n('STEP_TITLE', {title: i18n('COMPLETED'), current: 7, total: 7})} description={i18n('STEP_7_DESCRIPTION')}/>
-                <Message title={i18n('INSTALLATION_COMPLETED')} type="success">
+            <div className="install-completed">
+                <Message title={i18n('INSTALLATION_COMPLETED_TITLE')} type="success">
                     {i18n('INSTALLATION_COMPLETED_DESCRIPTION')}
                 </Message>
             </div>
@@ -29,4 +27,4 @@ class InstallStep7Completed extends React.Component {
     }
 }
 
-export default InstallStep7Completed;
\ No newline at end of file
+export default InstallCompleted;
diff --git a/client/src/app/install/install-step-7-completed.scss b/client/src/app/install/install-completed.scss
similarity index 100%
rename from client/src/app/install/install-step-7-completed.scss
rename to client/src/app/install/install-completed.scss
diff --git a/client/src/app/install/install-step-1-language.js b/client/src/app/install/install-step-1-language.js
index 240b3d1b..e94fda6d 100644
--- a/client/src/app/install/install-step-1-language.js
+++ b/client/src/app/install/install-step-1-language.js
@@ -14,7 +14,7 @@ class InstallStep1Language extends React.Component {
     render() {
         return (
             <div className="install-step-1">
-                <Header title={i18n('STEP_TITLE', {title: i18n('SELECT_LANGUAGE'), current: 1, total: 7})} description={i18n('STEP_1_DESCRIPTION')}/>
+                <Header title={i18n('STEP_TITLE', {title: i18n('SELECT_LANGUAGE'), current: 1, total: 6})} description={i18n('STEP_1_DESCRIPTION')} />
                 <LanguageSelector {...this.getLanguageSelectorProps()} />
                 <div className="install-step-1__button">
                     <Button size="medium" type="secondary" onClick={() => history.push('/install/step-2')}>
diff --git a/client/src/app/install/install-step-2-requirements.js b/client/src/app/install/install-step-2-requirements.js
index 8ff3e169..6f4606fa 100644
--- a/client/src/app/install/install-step-2-requirements.js
+++ b/client/src/app/install/install-step-2-requirements.js
@@ -30,7 +30,7 @@ class InstallStep2Requirements extends React.Component {
     render() {
         return (
             <div className="install-step-2">
-                <Header title={i18n('STEP_TITLE', {title: i18n('SERVER_REQUIREMENTS'), current: 2, total: 7})} description={i18n('STEP_2_DESCRIPTION')}/>
+                <Header title={i18n('STEP_TITLE', {title: i18n('SERVER_REQUIREMENTS'), current: 2, total: 6})} description={i18n('STEP_2_DESCRIPTION')} />
                 <div className="install-step-2__refresh">
                     <Button className="install-step-2__refresh-button" type="secondary" size="medium" onClick={this.retrieveRequirements.bind(this)}>
                         <Icon className="install-step-2__refresh-icon" name="refresh" /> {i18n('REFRESH')}
diff --git a/client/src/app/install/install-step-3-database.js b/client/src/app/install/install-step-3-database.js
index f4716c9f..55c5b7fc 100644
--- a/client/src/app/install/install-step-3-database.js
+++ b/client/src/app/install/install-step-3-database.js
@@ -24,7 +24,7 @@ class InstallStep3Database extends React.Component {
         const { loading } = this.state;
         return (
             <div className="install-step-3">
-                <Header title={i18n('STEP_TITLE', {title: i18n('DATABASE_CONFIGURATION'), current: 3, total: 7})} description={i18n('STEP_3_DESCRIPTION')}/>
+                <Header title={i18n('STEP_TITLE', {title: i18n('DATABASE_CONFIGURATION'), current: 3, total: 6})} description={i18n('STEP_3_DESCRIPTION')} />
                 {this.renderMessage()}
                 <Form loading={loading} onSubmit={this.onSubmit.bind(this)}>
                     <FormField name="dbHost" label={i18n('DATABASE_HOST')} fieldProps={{size: 'large'}} required/>
diff --git a/client/src/app/install/install-step-4-user-system.js b/client/src/app/install/install-step-4-user-system.js
index c986e8ba..4dca3afb 100644
--- a/client/src/app/install/install-step-4-user-system.js
+++ b/client/src/app/install/install-step-4-user-system.js
@@ -24,7 +24,7 @@ class InstallStep4UserSystem extends React.Component {
         const { form } = this.state
         return (
             <div className="install-step-4">
-                <Header title={i18n('STEP_TITLE', {title: i18n('USER_SYSTEM'), current: 4, total: 7})} description={i18n('STEP_4_DESCRIPTION')}/>
+                <Header title={i18n('STEP_TITLE', {title: i18n('USER_SYSTEM'), current: 4, total: 6})} description={i18n('STEP_4_DESCRIPTION')} />
                 <Form onSubmit={this.onSubmit.bind(this)} values={form} onChange={this.onChange.bind(this)}>
                     <div className="install-step-4__container">
                         <FormField
diff --git a/client/src/app/install/install-step-5-settings.js b/client/src/app/install/install-step-5-settings.js
index 4072ee7b..07c8db45 100755
--- a/client/src/app/install/install-step-5-settings.js
+++ b/client/src/app/install/install-step-5-settings.js
@@ -31,7 +31,7 @@ class InstallStep5Settings extends React.Component {
 
         return (
             <div className="install-step-5">
-                <Header title={i18n('STEP_TITLE', {title: i18n('SETTINGS'), current: 5, total: 7})} description={i18n('STEP_5_DESCRIPTION')}/>
+                <Header title={i18n('STEP_TITLE', {title: i18n('SETTINGS'), current: 5, total: 6})} description={i18n('STEP_5_DESCRIPTION')} />
                 {this.renderMessage()}
                 <Form loading={loading} onSubmit={this.onSubmit.bind(this)} value={form} onChange={(form) => this.setState({form})}>
                     <FormField name="title" label={i18n('TITLE')} fieldProps={{size: 'large'}} required/>
diff --git a/client/src/app/install/install-step-6-admin.js b/client/src/app/install/install-step-6-admin.js
index 7109ae71..856ff776 100644
--- a/client/src/app/install/install-step-6-admin.js
+++ b/client/src/app/install/install-step-6-admin.js
@@ -21,7 +21,7 @@ class InstallStep6Admin extends React.Component {
     render() {
         return (
             <div className="install-step-6">
-                <Header title={i18n('STEP_TITLE', {title: i18n('ADMIN_SETUP'), current: 6, total: 7})} description={i18n('STEP_6_DESCRIPTION')}/>
+                <Header title={i18n('STEP_TITLE', {title: i18n('ADMIN_SETUP'), current: 6, total: 6})} description={i18n('STEP_6_DESCRIPTION')} />
                 {this.renderMessage()}
                 <Form onSubmit={this.onSubmit.bind(this)}>
                     <FormField name="name" validation="NAME" label={i18n('ADMIN_NAME')} fieldProps={{size: 'large'}} required/>
@@ -57,7 +57,7 @@ class InstallStep6Admin extends React.Component {
                 path: '/system/init-admin',
                 data: form
             })
-                .then(() => history.push('/install/step-7'))
+                .then(() => history.push('/install/completed'))
                 .catch(({message}) => this.setState({
                     loading: false,
                     error: true,
diff --git a/client/src/data/languages/en.js b/client/src/data/languages/en.js
index 32c46237..f9565a11 100644
--- a/client/src/data/languages/en.js
+++ b/client/src/data/languages/en.js
@@ -285,7 +285,7 @@ export default {
     'ADMIN_EMAIL': 'Admin account email',
     'ADMIN_PASSWORD': 'Admin account password',
     'ADMIN_PASSWORD_DESCRIPTION': 'Please remember this password. It is needed for accessing the admin panel. You can change it later.',
-    'INSTALLATION_COMPLETED': 'Installation completed.',
+    'INSTALLATION_COMPLETED_TITLE': 'Installation completed',
     'INSTALLATION_COMPLETED_DESCRIPTION': 'The installation of OpenSupports is completed. Redirecting to admin panel...',
 
     'STEP_TITLE': 'Step {current} of {total} - {title}',
@@ -295,7 +295,6 @@ export default {
     'STEP_4_DESCRIPTION': 'Please select your user system preferences.',
     'STEP_5_DESCRIPTION': 'Please fill your general system preferences.',
     'STEP_6_DESCRIPTION': 'Please configure the administrator account.',
-    'STEP_7_DESCRIPTION': 'Installation is completed.',
 
     //VIEW DESCRIPTIONS
     'CREATE_TICKET_DESCRIPTION': 'This is a form for creating tickets. Fill the form and send us your issues/doubts/suggestions. Our support system will answer it as soon as possible.',