gavin/snipe-it
1
0
Fork 0
mirror of https://github.com/grokability/snipe-it.git synced 2026-03-12 17:52:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

applies a conditional to have the the integration test button function properly

Browse Source
This commit is contained in:
Godfrey M
2024-01-31 10:47:25 -08:00
parent 0eabb147b2
commit f452204d62
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Livewire/SlackSettingsForm.php
View File

@@ -79,6 +79,9 @@ class SlackSettingsForm extends Component
$this->webhook_channel = $this->setting->webhook_channel;
$this->webhook_botname = $this->setting->webhook_botname;
$this->webhook_options = $this->setting->webhook_selected;
if($this->webhook_selected == 'microsoft' ||$this->webhook_selected == 'google'){
$this->webhook_channel = 'NA';
}
if($this->setting->webhook_endpoint != null && $this->setting->webhook_channel != null){
@@ -103,6 +106,10 @@ class SlackSettingsForm extends Component
$this->isDisabled= '';
$this->save_button = trans('general.save');
}
if($this->webhook_selected == 'microsoft' ||$this->webhook_selected == 'google'){
$this->webhook_channel = 'NA';
}
}
private function isButtonDisabled() {

2
composer.json
View File

@@ -42,7 +42,7 @@
"guzzlehttp/guzzle": "^7.0.1",
"intervention/image": "^2.5",
"javiereguiluz/easyslugger": "^1.0",
"laravel-notification-channels/google-chat": "*",
"laravel-notification-channels/google-chat": "^1.0",
"laravel-notification-channels/microsoft-teams": "^1.1",
"laravel/framework": "^8.46",
"laravel/helpers": "^1.4",

2
resources/lang/en-US/admin/hardware/form.php
View File

@@ -16,7 +16,7 @@ return [
'checkedout_to' => 'Checked Out To',
'checkout_date' => 'Checkout Date',
'checkin_date' => 'Checkin Date',
'checkout_to' => 'Checked out to',
'checkout_to' => 'Checkout to',
'cost' => 'Purchase Cost',
'create' => 'Create Asset',
'date' => 'Purchase Date',