mirrors/Speedtest-Tracker
1
0
Fork 0
mirror of https://github.com/henrywhitaker3/Speedtest-Tracker.git synced 2025-12-24 06:28:27 +01:00
Code Issues Projects Releases Wiki Activity

More settings bugfixes

Browse Source
This commit is contained in:
Henry Whitaker
2020-07-07 23:29:29 +01:00
parent db25656a6f
commit e7f387e5c6
5 changed files with 11 additions and 142760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Helpers/SettingsHelper.php
View File

@@ -35,11 +35,11 @@ class SettingsHelper {
* @param String $value Value of setting * @param String $value Value of setting
* @return \App\Setting * @return \App\Setting
*/ */
public static function set(String $name, String $value) public static function set(String $name, $value)
{ {
$setting = SettingsHelper::get($name); $setting = SettingsHelper::get($name);
if($value == false) { if($value === false) {
$value = "0"; $value = "0";
} }

5
app/Http/Controllers/SettingsController.php
View File

@@ -79,7 +79,6 @@ class SettingsController extends Controller
$rule = [ $rule = [
'data' => [ 'array', 'required' ], 'data' => [ 'array', 'required' ],
'data.*.name' => [ 'string', 'required' ], 'data.*.name' => [ 'string', 'required' ],
'data.*.value' => [ 'required' ],
]; ];
$validator = Validator::make($request->all(), $rule); $validator = Validator::make($request->all(), $rule);
@@ -92,6 +91,10 @@ class SettingsController extends Controller
$settings = []; $settings = [];
foreach($request->data as $d) { foreach($request->data as $d) {
if(!isset($d['value']) || $d['value'] == null) {
$d['value'] = '';
}
if($d['name'] == 'speedtest_overview_time') { if($d['name'] == 'speedtest_overview_time') {
$ok = [ '00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23' ]; $ok = [ '00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23' ];
if(!in_array($d['value'], $ok)) { if(!in_array($d['value'], $ok)) {

10931
public/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

131829
public/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

2
resources/js/components/Home/SettingWithModal.js vendored
View File

@@ -117,7 +117,7 @@ export default class SettingWithModal extends Component {
name[0] = this.ucfirst(name[0]); name[0] = this.ucfirst(name[0]);
name = name.join(' '); name = name.join(' ');
if(e.obj.description == null) { if(e.obj.description == null || e.obj.description == '') {
var sm = { span: 12 }; var sm = { span: 12 };
var md = { span: 12 }; var md = { span: 12 };
} else { } else {