Ivan - Deploy changes [skip ci]
This commit is contained in:
parent
42c1e81fbc
commit
3299c3dd8d
client/src/app
admin/panel/settings
main/dashboard/dashboard-create-ticket
server/controllers
|
@ -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'],
|
||||
|
|
|
@ -33,6 +33,7 @@ class CreateTicketForm extends React.Component {
|
|||
form: {
|
||||
title: '',
|
||||
content: RichTextEditor.createEmptyValue(),
|
||||
departmentIndex: 0,
|
||||
language: 'en'
|
||||
}
|
||||
};
|
||||
|
|
|
@ -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());
|
||||
}
|
||||
|
|
|
@ -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());
|
||||
}
|
||||
|
|
|
@ -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()
|
||||
|
|
Loading…
Reference in New Issue