IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/community_bug_fix_27_04_2021' into dynamic-balance

Browse Source
This commit is contained in:
Moriz Wahl 2021-04-27 16:29:50 +02:00
commit c69845d4ca
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
community_server/src/Controller/AppRequestsController.php
View File

@ -98,8 +98,8 @@ class AppRequestsController extends AppController
$data = $this->request->input('json_decode');
}
$session_id = 0;
if(isset($data['session_id'])) {
$session_id = $data['session_id'];
if(isset($data->session_id)) {
$session_id = $data->session_id;
}
$login_request_result = $this->requestLogin($session_id, false);
if($login_request_result !== true) {
@ -119,12 +119,12 @@ class AppRequestsController extends AppController
return ['state' => 'error', 'msg' => 'amount is invalid', 'details' => $param['amount']];
}
if(isset($data['memo'])) {
$param['memo'] = $data['memo'];
if(isset($data->memo)) {
$param['memo'] = $data->memo;
}
if(isset($data['auto_sign'])) {
$param['auto_sign'] = boolval($data['auto_sign']);
if(isset($data->auto_sign)) {
$param['auto_sign'] = boolval($data->auto_sign);
}
return true;

3
frontend/src/views/KontoOverview/GddSend.vue
View File

@ -288,9 +288,6 @@ export default {
.pointer {
cursor: pointer;
}
.pointer:hover {
background-color: #3c4d69;
}
video {
max-height: 665px;
max-width: 665px;