More settings bugfixes

This commit is contained in:
Henry Whitaker
2020-07-07 23:36:07 +01:00
parent 90f083404c
commit 2e401908c6
8 changed files with 16 additions and 9 deletions

View File

@@ -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

View File

@@ -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";
}

View File

@@ -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([

View 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}

File diff suppressed because one or more lines are too long

View File

@@ -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 {