diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 541d4070ff..89704242ba 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -1163,7 +1163,7 @@ class Helper * } * @todo - use this everywhere else in the app where we have very long if/else config('app.lock_passwords') stuff */ - public function isDemoMode() { + public static function isDemoMode() { if (config('app.lock_passwords') === true) { return true; \Log::debug('app locked!'); @@ -1177,7 +1177,7 @@ class Helper * I know it's gauche to return a shitty HTML string, but this is just a helper and since it will be the same every single time, * it seemed pretty safe to do here. Don't you judge me. */ - public function showDemoModeFieldWarning() { + public static function showDemoModeFieldWarning() { if (Helper::isDemoMode()) { return "

" . trans('general.feature_disabled') . "

"; } diff --git a/database/migrations/2023_03_21_215218_update_slack_setting.php b/database/migrations/2023_03_21_215218_update_slack_setting.php new file mode 100644 index 0000000000..e4fdf75600 --- /dev/null +++ b/database/migrations/2023_03_21_215218_update_slack_setting.php @@ -0,0 +1,38 @@ +get(); + + foreach($settings as $setting){ + $setting->webhook_selected = 'slack'; + $setting->save(); + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php index a1df7ef242..4538e472bd 100644 --- a/resources/views/livewire/slack-settings-form.blade.php +++ b/resources/views/livewire/slack-settings-form.blade.php @@ -60,8 +60,11 @@
- {{ Form::select('webhook_selected', array('slack' => trans('admin/settings/general.slack'), 'general' => trans('admin/settings/general.general_webhook')), old('webhook_selected', $webhook_selected), array('class'=>'select2 form-control', 'aria-label' => 'webhook_selected', 'id' => 'select2', 'style'=>'width:90%')) }} - + @if (Helper::isDemoMode()) + {{ Form::select('webhook_selected', array('slack' => trans('admin/settings/general.slack'), 'general' => trans('admin/settings/general.general_webhook')), old('webhook_selected', $webhook_selected), array('class'=>'select2 form-control', 'aria-label' => 'webhook_selected', 'id' => 'select2', 'style'=>'width:90%', 'disabled')) }} + @else + {{ Form::select('webhook_selected', array('slack' => trans('admin/settings/general.slack'), 'general' => trans('admin/settings/general.general_webhook')), old('webhook_selected', $webhook_selected), array('class'=>'select2 form-control', 'aria-label' => 'webhook_selected', 'id' => 'select2', 'style'=>'width:90%')) }} + @endif