DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #12663 from Godmartinz/webhook_tweaks

Browse source 
fixes webhook variables to lowercase
This commit is contained in:
snipe 2023-03-13 16:55:32 -07:00 committed by GitHub
parent 477bd27cba 1bd37b49e9
commit a2667a7520
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/Http/Livewire/SlackSettingsForm.php
View file

@ -17,6 +17,7 @@ class SlackSettingsForm extends Component
public $webhook_placeholder; public $webhook_placeholder;
public $webhook_icon; public $webhook_icon;
public $webhook_selected; public $webhook_selected;
public array $webhook_text;
public Setting $setting; public Setting $setting;
@ -25,34 +26,29 @@ class SlackSettingsForm extends Component
'webhook_channel' => 'required_with:webhook_endpoint|starts_with:#|nullable', 'webhook_channel' => 'required_with:webhook_endpoint|starts_with:#|nullable',
'webhook_botname' => 'string|nullable', 'webhook_botname' => 'string|nullable',
]; ];
static $webhook_text= [
"Slack" => array(
"name" => "Slack", public function mount(){
$this->webhook_text= [
"slack" => array(
"name" => trans('admin/settings/general.slack') ,
"icon" => 'fab fa-slack', "icon" => 'fab fa-slack',
"placeholder" => "https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX", "placeholder" => "https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX",
"link" => 'https://api.slack.com/messaging/webhooks', "link" => 'https://api.slack.com/messaging/webhooks',
), ),
// "Discord" => array( "general"=> array(
// "name" => "Discord", "name" => trans('admin/settings/general.general_webhook'),
// "icon" => 'fab fa-discord',
// "placeholder" => "https://discord.com/api/webhooks/XXXXXXXXXXXXXXXXXXXXX",
// "link" => 'https://support.discord.com/hc/en-us/articles/360045093012-Server-Integrations-Page',
// ),
"General"=> array(
"name" => "General",
"icon" => "fab fa-hashtag", "icon" => "fab fa-hashtag",
"placeholder" => "", "placeholder" => "",
"link" => "", "link" => "",
), ),
]; ];
public function mount(){
$this->setting = Setting::getSettings(); $this->setting = Setting::getSettings();
$this->webhook_selected = $this->setting->webhook_selected; $this->webhook_selected = $this->setting->webhook_selected;
$this->webhook_placeholder = self::$webhook_text[$this->setting->webhook_selected]["placeholder"]; $this->webhook_placeholder = $this->webhook_text[$this->setting->webhook_selected]["placeholder"];
$this->webhook_name = self::$webhook_text[$this->setting->webhook_selected]["name"]; $this->webhook_name = $this->webhook_text[$this->setting->webhook_selected]["name"];
$this->webhook_icon = self::$webhook_text[$this->setting->webhook_selected]["icon"]; $this->webhook_icon = $this->webhook_text[$this->setting->webhook_selected]["icon"];
$this->webhook_endpoint = $this->setting->webhook_endpoint; $this->webhook_endpoint = $this->setting->webhook_endpoint;
$this->webhook_channel = $this->setting->webhook_channel; $this->webhook_channel = $this->setting->webhook_channel;
$this->webhook_botname = $this->setting->webhook_botname; $this->webhook_botname = $this->setting->webhook_botname;
@ -61,15 +57,15 @@ class SlackSettingsForm extends Component
} }
public function updated($field){ public function updated($field){
if($this->webhook_selected != 'General') { if($this->webhook_selected != 'general') {
$this->validateOnly($field, $this->rules); $this->validateOnly($field, $this->rules);
} }
} }
public function updatedWebhookSelected(){ public function updatedWebhookSelected(){
$this->webhook_name = self::$webhook_text[$this->webhook_selected]['name']; $this->webhook_name = $this->webhook_text[$this->webhook_selected]['name'];
$this->webhook_icon = self::$webhook_text[$this->webhook_selected]["icon"]; ; $this->webhook_icon = $this->webhook_text[$this->webhook_selected]["icon"]; ;
$this->webhook_placeholder = self::$webhook_text[$this->webhook_selected]["placeholder"]; $this->webhook_placeholder = $this->webhook_text[$this->webhook_selected]["placeholder"];
$this->webhook_link = self::$webhook_text[$this->webhook_selected]["link"]; $this->webhook_link = $this->webhook_text[$this->webhook_selected]["link"];
} }
@ -119,7 +115,7 @@ class SlackSettingsForm extends Component
} }
public function submit() public function submit()
{ {
if($this->webhook_selected != 'General') { if($this->webhook_selected != 'general') {
$this->validate($this->rules); $this->validate($this->rules);
} }

2
database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php
View file

@ -14,7 +14,7 @@ class AddsWebhookOptionToSettingsTable extends Migration
public function up() public function up()
{ {
Schema::table('settings', function (Blueprint $table) { Schema::table('settings', function (Blueprint $table) {
$table->string('webhook_selected')->after('slack_botname')->default('Slack')->nullable(); $table->string('webhook_selected')->after('slack_botname')->default('slack')->nullable();
$table->renameColumn('slack_botname', 'webhook_botname'); $table->renameColumn('slack_botname', 'webhook_botname');
$table->renameColumn('slack_endpoint', 'webhook_endpoint'); $table->renameColumn('slack_endpoint', 'webhook_endpoint');
$table->renameColumn('slack_channel', 'webhook_channel'); $table->renameColumn('slack_channel', 'webhook_channel');

2
resources/lang/en/admin/settings/general.php
View file

@ -199,6 +199,8 @@ return [
'show_images_in_email_help' => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.', 'show_images_in_email_help' => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
'site_name' => 'Site Name', 'site_name' => 'Site Name',
'integrations' => 'Integrations', 'integrations' => 'Integrations',
'slack' => 'Slack',
'general_webhook' => 'General Webhook',
'webhook' => ':app', 'webhook' => ':app',
'webhook_title' => 'Update Webhook Settings', 'webhook_title' => 'Update Webhook Settings',
'webhook_help' => 'Integration settings', 'webhook_help' => 'Integration settings',

6
resources/views/livewire/slack-settings-form.blade.php
View file

@ -24,7 +24,7 @@
</div> </div>
<div class="box-body"> <div class="box-body">
<div class="col-md-12"> <div class="col-md-12">
@if($webhook_selected != 'General') @if($webhook_selected != 'general')
<p> <p>
{!! trans('admin/settings/general.webhook_integration_help',array('webhook_link' => $webhook_link, 'app' => $webhook_name)) !!} {!! trans('admin/settings/general.webhook_integration_help',array('webhook_link' => $webhook_link, 'app' => $webhook_name)) !!}
</p> </p>
@ -64,9 +64,9 @@
aria-label="webhook_selected" aria-label="webhook_selected"
class="form-control " class="form-control "
> >
<option value="Slack">Slack</option> <option value="slack">{{trans('admin/settings/general.slack')}}</option>
{{-- <option value="Discord">Discord</option>--}} {{-- <option value="Discord">Discord</option>--}}
<option value="General">General Webhook</option> <option value="general">{{trans('admin/settings/general.general_webhook')}}</option>
</select> </select>
</div> </div>
<br><br><br> <br><br><br>