mirror of
https://github.com/henrywhitaker3/Speedtest-Tracker.git
synced 2025-12-24 14:31:52 +01:00
More settings bugfixes
This commit is contained in:
@@ -28,10 +28,10 @@ else
|
||||
|
||||
HOME=/config && timeout 5s s6-setuidgid abc /site/app/Bin/speedtest --accept-license --accept-gdpr > /dev/null
|
||||
HOME=/root
|
||||
else
|
||||
HOME=/config && timeout 5s s6-setuidgid abc /config/www/app/Bin/speedtest --accept-license --accept-gdpr > /dev/null
|
||||
HOME=/root
|
||||
fi
|
||||
|
||||
HOME=/config && timeout 5s s6-setuidgid abc /config/www/app/Bin/speedtest --accept-license --accept-gdpr > /dev/null
|
||||
HOME=/root
|
||||
fi
|
||||
|
||||
# Copy site files to /config
|
||||
@@ -79,7 +79,7 @@ fi
|
||||
if [ -z ${SLACK_WEBHOOK+x} ]; then
|
||||
echo "Slack webhook is unset"
|
||||
sed "s,SLACK_WEBHOOK=.*,SLACK_WEBHOOK=," -i.bak /config/www/.env
|
||||
elsecd
|
||||
else
|
||||
echo "Slack webhook set, updating db"
|
||||
sed "s,SLACK_WEBHOOK=.*,SLACK_WEBHOOK=$SLACK_WEBHOOK," -i.bak /config/www/.env
|
||||
php /config/www/artisan speedtest:slack $SLACK_WEBHOOK
|
||||
|
||||
@@ -35,11 +35,11 @@ class SettingsHelper {
|
||||
* @param String $value Value of setting
|
||||
* @return \App\Setting
|
||||
*/
|
||||
public static function set(String $name, String $value)
|
||||
public static function set(String $name, $value)
|
||||
{
|
||||
$setting = SettingsHelper::get($name);
|
||||
|
||||
if($value == false) {
|
||||
if($value === false) {
|
||||
$value = "0";
|
||||
}
|
||||
|
||||
|
||||
@@ -79,7 +79,6 @@ class SettingsController extends Controller
|
||||
$rule = [
|
||||
'data' => [ 'array', 'required' ],
|
||||
'data.*.name' => [ 'string', 'required' ],
|
||||
'data.*.value' => [ 'required' ],
|
||||
];
|
||||
|
||||
$validator = Validator::make($request->all(), $rule);
|
||||
@@ -92,7 +91,12 @@ class SettingsController extends Controller
|
||||
|
||||
$settings = [];
|
||||
foreach($request->data as $d) {
|
||||
if(!isset($d['value']) || $d['value'] == null) {
|
||||
$d['value'] = '';
|
||||
}
|
||||
|
||||
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' ];
|
||||
if(!in_array($d['value'], $ok)) {
|
||||
return response()->json([
|
||||
|
||||
BIN
conf/site/node_modules/.cache/babel-loader/87fd79e8171996e874254263d6138e20.json.gz
generated
vendored
Normal file
BIN
conf/site/node_modules/.cache/babel-loader/87fd79e8171996e874254263d6138e20.json.gz
generated
vendored
Normal file
Binary file not shown.
File diff suppressed because one or more lines are too long
2
conf/site/node_modules/.cache/terser-webpack-plugin/index-v5/df/26/ae0ca3480ab9fbacc3c509ca17de58f1b9b83198d5586ef71d83c3746f6c
generated
vendored
Normal file
2
conf/site/node_modules/.cache/terser-webpack-plugin/index-v5/df/26/ae0ca3480ab9fbacc3c509ca17de58f1b9b83198d5586ef71d83c3746f6c
generated
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
|
||||
419cc73079341b2234d09f1f89dea3076cea7e53 {"key":"{\"terser\":\"4.6.10\",\"terser-webpack-plugin\":\"2.3.5\",\"terser-webpack-plugin-options\":{\"test\":new RegExp(\"\\\\.m?js(\\\\?.*)?$\", \"i\"),\"chunkFilter\":() => true,\"warningsFilter\":() => true,\"extractComments\":true,\"sourceMap\":true,\"cache\":true,\"cacheKeys\":defaultCacheKeys => defaultCacheKeys,\"parallel\":true,\"include\":undefined,\"exclude\":undefined,\"minify\":undefined,\"terserOptions\":{\"compress\":{\"warnings\":false},\"output\":{\"comments\":false}}},\"nodeVersion\":\"v10.19.0\",\"filename\":\"\\u002Fjs\\u002Fapp.js\",\"contentHash\":\"26d9ff8a17841c8bbc33\"}","integrity":"sha512-adiNSrzbZbjRtLPl+dDpeFnhBhQHFwq4UJoF3FQTPoxlbuML5o9m+WEvaa+tTuqeCnmG+iIUo5Vh4TbRiG8QQA==","time":1594161028075,"size":2545082}
|
||||
2
conf/site/public/js/app.js
vendored
2
conf/site/public/js/app.js
vendored
File diff suppressed because one or more lines are too long
@@ -117,7 +117,7 @@ export default class SettingWithModal extends Component {
|
||||
name[0] = this.ucfirst(name[0]);
|
||||
name = name.join(' ');
|
||||
|
||||
if(e.obj.description == null) {
|
||||
if(e.obj.description == null || e.obj.description == '') {
|
||||
var sm = { span: 12 };
|
||||
var md = { span: 12 };
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user