DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-05 10:57:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-09-29 01:51:40 +01:00
parent 581e56198c 0184d25a95
commit 352e53a036
5 changed files with 28 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/LabelsController.php
View file

@ -31,7 +31,7 @@ class LabelsController extends Controller
$exampleAsset->id = 999999; $exampleAsset->id = 999999;
$exampleAsset->name = 'JEN-867-5309'; $exampleAsset->name = 'JEN-867-5309';
$exampleAsset->asset_tag = 'TCA-00001'; $exampleAsset->asset_tag = '100001';
$exampleAsset->serial = 'SN9876543210'; $exampleAsset->serial = 'SN9876543210';
$exampleAsset->company = new Company(); $exampleAsset->company = new Company();

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

@ -12,7 +12,7 @@ class SlackSettingsForm extends Component
public $webhook_endpoint; public $webhook_endpoint;
public $webhook_channel; public $webhook_channel;
public $webhook_botname; public $webhook_botname;
public $isDisabled ='' ; public $isDisabled ='disabled' ;
public $webhook_name; public $webhook_name;
public $webhook_link; public $webhook_link;
public $webhook_placeholder; public $webhook_placeholder;
@ -22,11 +22,17 @@ class SlackSettingsForm extends Component
public Setting $setting; public Setting $setting;
public $webhook_endpoint_rules;
protected $rules = [ protected $rules = [
'webhook_endpoint' => 'url|required_with:webhook_channel|starts_with:https://hooks.slack.com/services|nullable', 'webhook_endpoint' => 'required_with:webhook_channel|starts_with:http://,https://,ftp://,irc://,https://hooks.slack.com/services/|url|nullable',
'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',
]; ];
public $messages = [
'webhook_endpoint.starts_with' => 'your webhook endpoint should begin with http://, https:// or other protocol.',
];
public function mount() { public function mount() {
$this->webhook_text= [ $this->webhook_text= [
@ -55,9 +61,7 @@ class SlackSettingsForm extends Component
$this->webhook_botname = $this->setting->webhook_botname; $this->webhook_botname = $this->setting->webhook_botname;
$this->webhook_options = $this->setting->webhook_selected; $this->webhook_options = $this->setting->webhook_selected;
if($this->setting->webhook_selected == 'general'){
$this->isDisabled='';
}
if($this->setting->webhook_endpoint != null && $this->setting->webhook_channel != null){ if($this->setting->webhook_endpoint != null && $this->setting->webhook_channel != null){
$this->isDisabled= ''; $this->isDisabled= '';
} }
@ -65,9 +69,8 @@ class SlackSettingsForm extends Component
} }
public function updated($field) { public function updated($field) {
if($this->webhook_selected != 'general') {
$this->validateOnly($field, $this->rules); $this->validateOnly($field, $this->rules);
}
} }
public function updatedWebhookSelected() { public function updatedWebhookSelected() {
@ -82,7 +85,6 @@ class SlackSettingsForm extends Component
} }
private function isButtonDisabled() { private function isButtonDisabled() {
if($this->webhook_selected == 'slack') {
if (empty($this->webhook_endpoint)) { if (empty($this->webhook_endpoint)) {
$this->isDisabled = 'disabled'; $this->isDisabled = 'disabled';
$this->save_button = trans('admin/settings/general.webhook_presave'); $this->save_button = trans('admin/settings/general.webhook_presave');
@ -93,8 +95,6 @@ class SlackSettingsForm extends Component
} }
} }
}
public function render() public function render()
{ {
$this->isButtonDisabled(); $this->isButtonDisabled();
@ -108,6 +108,7 @@ class SlackSettingsForm extends Component
'defaults' => [ 'defaults' => [
'exceptions' => false, 'exceptions' => false,
], ],
'allow_redirects' => false,
]); ]);
$payload = json_encode( $payload = json_encode(
@ -116,18 +117,23 @@ class SlackSettingsForm extends Component
'text' => trans('general.webhook_test_msg', ['app' => $this->webhook_name]), 'text' => trans('general.webhook_test_msg', ['app' => $this->webhook_name]),
'username' => e($this->webhook_botname), 'username' => e($this->webhook_botname),
'icon_emoji' => ':heart:', 'icon_emoji' => ':heart:',
]); ]);
try { try {
$test = $webhook->post($this->webhook_endpoint, ['body' => $payload]);
$webhook->post($this->webhook_endpoint, ['body' => $payload]); if(($test->getStatusCode() == 302)||($test->getStatusCode() == 301)){
return session()->flash('error' , trans('admin/settings/message.webhook.error_redirect', ['endpoint' => $this->webhook_endpoint]));
}
$this->isDisabled=''; $this->isDisabled='';
$this->save_button = trans('general.save'); $this->save_button = trans('general.save');
return session()->flash('success' , 'Your '.$this->webhook_name.' Integration works!'); return session()->flash('success' , trans('admin/settings/message.webhook.success', ['webhook_name' => $this->webhook_name]));
} catch (\Exception $e) { } catch (\Exception $e) {
$this->isDisabled= 'disabled'; $this->isDisabled='disabled';
$this->save_button = trans('admin/settings/general.webhook_presave');
return session()->flash('error' , trans('admin/settings/message.webhook.error', ['error_message' => $e->getMessage(), 'app' => $this->webhook_name])); return session()->flash('error' , trans('admin/settings/message.webhook.error', ['error_message' => $e->getMessage(), 'app' => $this->webhook_name]));
} }
@ -158,9 +164,7 @@ class SlackSettingsForm extends Component
if (Helper::isDemoMode()) { if (Helper::isDemoMode()) {
session()->flash('error',trans('general.feature_disabled')); session()->flash('error',trans('general.feature_disabled'));
} else { } else {
if ($this->webhook_selected != 'general') {
$this->validate($this->rules); $this->validate($this->rules);
}
$this->setting->webhook_selected = $this->webhook_selected; $this->setting->webhook_selected = $this->webhook_selected;
$this->setting->webhook_endpoint = $this->webhook_endpoint; $this->setting->webhook_endpoint = $this->webhook_endpoint;

3
app/Models/Labels/Label.php
View file

@ -7,6 +7,7 @@ use Illuminate\Support\Collection;
use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\File;
use TCPDF; use TCPDF;
use TCPDF_STATIC; use TCPDF_STATIC;
use TypeError;
/** /**
* Model for Labels. * Model for Labels.
@ -372,7 +373,7 @@ abstract class Label
if (empty($value)) return; if (empty($value)) return;
try { try {
$pdf->write1DBarcode($value, $type, $x, $y, $width, $height, null, ['stretch'=>true]); $pdf->write1DBarcode($value, $type, $x, $y, $width, $height, null, ['stretch'=>true]);
} catch (\Exception $e) { } catch (\Exception|TypeError $e) {
\Log::error('The 1D barcode ' . $value . ' is not compliant with the barcode type '. $type); \Log::error('The 1D barcode ' . $value . ' is not compliant with the barcode type '. $type);
} }
} }

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

@ -35,10 +35,12 @@ return [
], ],
'webhook' => [ 'webhook' => [
'sending' => 'Sending :app test message...', 'sending' => 'Sending :app test message...',
'success' => 'Your :webhook_name Integration works!',
'success_pt1' => 'Success! Check the ', 'success_pt1' => 'Success! Check the ',
'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.', 'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
'500' => '500 Server Error.', '500' => '500 Server Error.',
'error' => 'Something went wrong. :app responded with: :error_message', 'error' => 'Something went wrong. :app responded with: :error_message',
'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
'error_misc' => 'Something went wrong. :( ', 'error_misc' => 'Something went wrong. :( ',
] ]
]; ];

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

@ -79,7 +79,7 @@
{{ Form::label('webhook_endpoint', trans('admin/settings/general.webhook_endpoint',['app' => $webhook_name ])) }} {{ Form::label('webhook_endpoint', trans('admin/settings/general.webhook_endpoint',['app' => $webhook_name ])) }}
</div> </div>
<div class="col-md-9 required"> <div class="col-md-9 required">
<input type="text" wire:model="webhook_endpoint" class="form-control" placeholder="{{$webhook_placeholder}}" value="{{old('webhook_endpoint', $webhook_endpoint)}}"{{ Helper::isDemoMode() ? ' disabled' : ''}}> <input type="text" wire:model.lazy="webhook_endpoint" class="form-control" placeholder="{{$webhook_placeholder}}" value="{{old('webhook_endpoint', $webhook_endpoint)}}"{{ Helper::isDemoMode() ? ' disabled' : ''}}>
{!! $errors->first('webhook_endpoint', '<span class="alert-msg" aria-hidden="true">:message</span>') !!} {!! $errors->first('webhook_endpoint', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
</div> </div>
@ -95,7 +95,7 @@
{{ Form::label('webhook_channel', trans('admin/settings/general.webhook_channel',['app' => $webhook_name ])) }} {{ Form::label('webhook_channel', trans('admin/settings/general.webhook_channel',['app' => $webhook_name ])) }}
</div> </div>
<div class="col-md-9 required"> <div class="col-md-9 required">
<input type="text" wire:model="webhook_channel" class="form-control" placeholder="#IT-Ops" value="{{ old('webhook_channel', $webhook_channel) }}"{{ Helper::isDemoMode() ? ' disabled' : ''}}> <input type="text" wire:model.lazy="webhook_channel" class="form-control" placeholder="#IT-Ops" value="{{ old('webhook_channel', $webhook_channel) }}"{{ Helper::isDemoMode() ? ' disabled' : ''}}>
{!! $errors->first('webhook_channel', '<span class="alert-msg" aria-hidden="true">:message</span>') !!} {!! $errors->first('webhook_channel', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
@ -111,7 +111,7 @@
{{ Form::label('webhook_botname', trans('admin/settings/general.webhook_botname',['app' => $webhook_name ])) }} {{ Form::label('webhook_botname', trans('admin/settings/general.webhook_botname',['app' => $webhook_name ])) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<input type="text" wire:model="webhook_botname" class='form-control' placeholder="Snipe-Bot" {{ old('webhook_botname', $webhook_botname)}}{{ Helper::isDemoMode() ? ' disabled' : ''}}> <input type="text" wire:model.lazy="webhook_botname" class='form-control' placeholder="Snipe-Bot" {{ old('webhook_botname', $webhook_botname)}}{{ Helper::isDemoMode() ? ' disabled' : ''}}>
{!! $errors->first('webhook_botname', '<span class="alert-msg" aria-hidden="true">:message</span>') !!} {!! $errors->first('webhook_botname', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div><!--col-md-10--> </div><!--col-md-10-->
</div> </div>
@ -121,7 +121,6 @@
@endif @endif
<!--Webhook Integration Test--> <!--Webhook Integration Test-->
@if($webhook_selected == 'slack')
@if($webhook_endpoint != null && $webhook_channel != null) @if($webhook_endpoint != null && $webhook_channel != null)
<div class="form-group"> <div class="form-group">
<div class="col-md-offset-2 col-md-9"> <div class="col-md-offset-2 col-md-9">
@ -138,7 +137,6 @@
</div> </div>
</div> </div>
@endif @endif
@endif
</div><!-- /.col-md-12 --> </div><!-- /.col-md-12 -->
</div><!-- /.box-body --> </div><!-- /.box-body -->