tyler.durden/opensupports
1
0
Fork 0
mirror of https://github.com/opensupports/opensupports.git synced 2025-07-28 08:14:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged in deploy-dev3-bloque-3 (pull request #116)

Browse Source 
Ivan - Deploy changes
This commit is contained in:
Ivan Diaz 2017-01-11 00:41:14 -03:00
commit 149a18c52e
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/admin/panel/settings/admin-panel-system-preferences.js
View File

@ -173,7 +173,7 @@ class AdminPanelSystemPreferences extends React.Component {
'smtp-host': form['smtp-host'], 'smtp-host': form['smtp-host'],
'smtp-port': form['smtp-port'], 'smtp-port': form['smtp-port'],
'smtp-user': form['smtp-user'], 'smtp-user': form['smtp-user'],
'smtp-pass': form['smtp-password'], 'smtp-pass': form['smtp-pass'],
'maintenance-mode': form['maintenance-mode'], 'maintenance-mode': form['maintenance-mode'],
'allow-attachments': form['allow-attachments'], 'allow-attachments': form['allow-attachments'],
'max-size': form['max-size'], 'max-size': form['max-size'],

1
client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.js
View File

@ -33,6 +33,7 @@ class CreateTicketForm extends React.Component {
form: { form: {
title: '', title: '',
content: RichTextEditor.createEmptyValue(), content: RichTextEditor.createEmptyValue(),
departmentIndex: 0,
language: 'en' language: 'en'
} }
}; };

2
server/controllers/staff/last-events.php
View File

@ -27,7 +27,7 @@ class LastEventsStaffController extends Controller {
$query = substr($query,0,-3); $query = substr($query,0,-3);
$query .= ') ORDER BY id desc LIMIT ? OFFSET ?' ; $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()); Response::respondSuccess($eventList->toArray());
} }

2
server/controllers/system/get-logs.php
View File

@ -18,7 +18,7 @@ class GetLogsController extends Controller {
public function handler() { public function handler() {
$page = Controller::request('page'); $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()); Response::respondSuccess($logList->toArray());
} }

4
server/controllers/system/get-settings.php
View File

@ -26,8 +26,8 @@ class GetSettingsController extends Controller {
'title' => Setting::getSetting('title')->getValue(), 'title' => Setting::getSetting('title')->getValue(),
'no-reply-email' => Setting::getSetting('no-reply-email')->getValue(), 'no-reply-email' => Setting::getSetting('no-reply-email')->getValue(),
'smtp-port' => Setting::getSetting('smtp-port')->getValue(), 'smtp-port' => Setting::getSetting('smtp-port')->getValue(),
'smtp-host' => Setting::getSetting('smtp-port')->getValue(), 'smtp-host' => Setting::getSetting('smtp-host')->getValue(),
'smtp-user' => Setting::getSetting('smtp-port')->getValue(), 'smtp-user' => Setting::getSetting('smtp-user')->getValue(),
'departments' => Department::getDepartmentNames(), 'departments' => Department::getDepartmentNames(),
'supportedLanguages' => Language::getSupportedLanguages(), 'supportedLanguages' => Language::getSupportedLanguages(),
'allowedLanguages' => Language::getAllowedLanguages() 'allowedLanguages' => Language::getAllowedLanguages()