From 3299c3dd8d7c7f5a193082035edfb9c0c0601567 Mon Sep 17 00:00:00 2001
From: Ivan Diaz <ivan@opensupports.com>
Date: Wed, 11 Jan 2017 00:21:27 -0300
Subject: [PATCH] Ivan - Deploy changes [skip ci]

---
 .../admin/panel/settings/admin-panel-system-preferences.js    | 2 +-
 .../dashboard/dashboard-create-ticket/create-ticket-form.js   | 1 +
 server/controllers/staff/last-events.php                      | 2 +-
 server/controllers/system/get-logs.php                        | 2 +-
 server/controllers/system/get-settings.php                    | 4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/client/src/app/admin/panel/settings/admin-panel-system-preferences.js b/client/src/app/admin/panel/settings/admin-panel-system-preferences.js
index 11102db2..21c7d44b 100644
--- a/client/src/app/admin/panel/settings/admin-panel-system-preferences.js
+++ b/client/src/app/admin/panel/settings/admin-panel-system-preferences.js
@@ -173,7 +173,7 @@ class AdminPanelSystemPreferences extends React.Component {
                 'smtp-host': form['smtp-host'],
                 'smtp-port': form['smtp-port'],
                 'smtp-user': form['smtp-user'],
-                'smtp-pass': form['smtp-password'],
+                'smtp-pass': form['smtp-pass'],
                 'maintenance-mode': form['maintenance-mode'],
                 'allow-attachments': form['allow-attachments'],
                 'max-size': form['max-size'],
diff --git a/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.js b/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.js
index 84eb980b..83b012bc 100644
--- a/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.js
+++ b/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.js
@@ -33,6 +33,7 @@ class CreateTicketForm extends React.Component {
         form: {
             title: '',
             content: RichTextEditor.createEmptyValue(),
+            departmentIndex: 0,
             language: 'en'
         }
     };
diff --git a/server/controllers/staff/last-events.php b/server/controllers/staff/last-events.php
index 6950bf47..c6de992f 100644
--- a/server/controllers/staff/last-events.php
+++ b/server/controllers/staff/last-events.php
@@ -27,7 +27,7 @@ class LastEventsStaffController extends Controller {
         $query = substr($query,0,-3);
         $query .= ') ORDER BY id desc LIMIT ? OFFSET ?' ;
 
-        $eventList = Ticketevent::find($query, [10, 10*($page-1)+1]);
+        $eventList = Ticketevent::find($query, [10, 10*($page-1)]);
 
         Response::respondSuccess($eventList->toArray());
     }
diff --git a/server/controllers/system/get-logs.php b/server/controllers/system/get-logs.php
index fdee9e6c..99217560 100644
--- a/server/controllers/system/get-logs.php
+++ b/server/controllers/system/get-logs.php
@@ -18,7 +18,7 @@ class GetLogsController extends Controller {
 
     public function handler() {
         $page = Controller::request('page');
-        $logList = Log::find('ORDER BY id desc LIMIT ? OFFSET ?', [10, 10*($page-1)+1]);
+        $logList = Log::find('ORDER BY id desc LIMIT ? OFFSET ?', [10, 10*($page-1)]);
 
         Response::respondSuccess($logList->toArray());
     }
diff --git a/server/controllers/system/get-settings.php b/server/controllers/system/get-settings.php
index 566110f3..20993359 100644
--- a/server/controllers/system/get-settings.php
+++ b/server/controllers/system/get-settings.php
@@ -26,8 +26,8 @@ class GetSettingsController extends Controller {
                 'title' => Setting::getSetting('title')->getValue(),
                 'no-reply-email' => Setting::getSetting('no-reply-email')->getValue(),
                 'smtp-port' => Setting::getSetting('smtp-port')->getValue(),
-                'smtp-host' => Setting::getSetting('smtp-port')->getValue(),
-                'smtp-user' => Setting::getSetting('smtp-port')->getValue(),
+                'smtp-host' => Setting::getSetting('smtp-host')->getValue(),
+                'smtp-user' => Setting::getSetting('smtp-user')->getValue(),
                 'departments' => Department::getDepartmentNames(),
                 'supportedLanguages' => Language::getSupportedLanguages(),
                 'allowedLanguages' => Language::getAllowedLanguages()