mirror of
https://github.com/opensupports/opensupports.git
synced 2025-07-31 01:35:15 +02:00
Revert "Revert "fix bug #58""
This reverts commit 4b3ea709c82dd90ca9f8ea2f7f9f0015658eee6e.
This commit is contained in:
parent
f211bd9cea
commit
8f8c481d58
@ -53,7 +53,7 @@ class EditSettingsController extends Controller {
|
|||||||
];
|
];
|
||||||
|
|
||||||
foreach($settings as $setting) {
|
foreach($settings as $setting) {
|
||||||
if(Controller::request($setting)) {
|
if(Controller::request($setting)!==null) {
|
||||||
$settingInstance = Setting::getSetting($setting);
|
$settingInstance = Setting::getSetting($setting);
|
||||||
$settingInstance->value = Controller::request($setting);
|
$settingInstance->value = Controller::request($setting);
|
||||||
$settingInstance->store();
|
$settingInstance->store();
|
||||||
@ -68,7 +68,7 @@ class EditSettingsController extends Controller {
|
|||||||
|
|
||||||
Response::respondSuccess();
|
Response::respondSuccess();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function handleLanguages() {
|
public function handleLanguages() {
|
||||||
$allowed = json_decode(Controller::request('allowedLanguages'));
|
$allowed = json_decode(Controller::request('allowedLanguages'));
|
||||||
$supported = json_decode(Controller::request('supportedLanguages'));
|
$supported = json_decode(Controller::request('supportedLanguages'));
|
||||||
@ -83,4 +83,4 @@ class EditSettingsController extends Controller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -66,10 +66,13 @@ class ChangeDepartmentController extends Controller {
|
|||||||
$ticket->addEvent($event);
|
$ticket->addEvent($event);
|
||||||
$ticket->department = $department;
|
$ticket->department = $department;
|
||||||
$ticket->unread = true;
|
$ticket->unread = true;
|
||||||
|
if(!Controller::getLoggedUser()->sharedDepartmentList->includesId($department->id)) {
|
||||||
|
$ticket->owner = null;
|
||||||
|
}
|
||||||
$ticket->store();
|
$ticket->store();
|
||||||
|
|
||||||
Log::createLog('DEPARTMENT_CHANGED', $ticket->ticketNumber);
|
Log::createLog('DEPARTMENT_CHANGED', $ticket->ticketNumber);
|
||||||
|
|
||||||
Response::respondSuccess();
|
Response::respondSuccess();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,7 +6,7 @@ describe'system/edit-settings' do
|
|||||||
result= request('/system/edit-settings', {
|
result= request('/system/edit-settings', {
|
||||||
"csrf_userid" => $csrf_userid,
|
"csrf_userid" => $csrf_userid,
|
||||||
"csrf_token" => $csrf_token,
|
"csrf_token" => $csrf_token,
|
||||||
"maintenance-mode" => false,
|
"maintenance-mode" => 0,
|
||||||
"time-zone" => -3,
|
"time-zone" => -3,
|
||||||
"layout" => 'full-width',
|
"layout" => 'full-width',
|
||||||
"allow-attachments" => 1,
|
"allow-attachments" => 1,
|
||||||
@ -82,4 +82,4 @@ describe'system/edit-settings' do
|
|||||||
|
|
||||||
request('/user/logout')
|
request('/user/logout')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user