DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

should be all good now

Browse source
This commit is contained in:
spencerrlongg 2024-09-25 15:30:41 -05:00
parent 9df78a9ed0
commit 852a56fa9b
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
resources/views/livewire/custom-field-set-default-values-for-model.blade.php
View file

@ -1,5 +1,4 @@
<span> <span>
@dump($errors)
<div class="form-group{{ $errors->has('custom_fieldset') ? ' has-error' : '' }}"> <div class="form-group{{ $errors->has('custom_fieldset') ? ' has-error' : '' }}">
<label for="custom_fieldset" class="col-md-3 control-label"> <label for="custom_fieldset" class="col-md-3 control-label">
{{ trans('admin/models/general.fieldset') }} {{ trans('admin/models/general.fieldset') }}
@ -24,12 +23,9 @@
@if ($this->fields) @if ($this->fields)
@foreach ($this->fields as $field) @foreach ($this->fields as $field)
@if($errors->has($field->db_column_name()))
"poop"
@endif
<div class="form-group" wire:key="field-{{ $field->id }}"> <div class="form-group" wire:key="field-{{ $field->id }}">
<label class="col-md-3 control-label{{ $errors->has($field->name) ? ' has-error' : '' }}">{{ $field->name }}</label> <label class="col-md-3 control-label{{ $errors->has($field->db_column_name()) ? ' has-error' : '' }}">{{ $field->name }}</label>
<div class="col-md-7"> <div class="col-md-7">
@ -128,10 +124,17 @@
Unknown field element: {{ $field->element }} Unknown field element: {{ $field->element }}
</span> </span>
@endif @endif
<?php
$errormessage = $errors->first($field->db_column_name());
if ($errormessage) {
$errormessage = preg_replace('/ snipeit /', '', $errormessage);
print('<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> '.$errormessage.'</span>');
}
?>
</div> </div>
</div> </div>
@endforeach @endforeach
@endif @endif

14
resources/views/models/custom_fields_form.blade.php
View file

@ -66,13 +66,13 @@
<p class="help-block">{{ $field->help_text }}</p> <p class="help-block">{{ $field->help_text }}</p>
@endif @endif
<?php <?php
$errormessage=$errors->first($field->db_column_name()); $errormessage = $errors->first($field->db_column_name());
if ($errormessage) { if ($errormessage) {
$errormessage=preg_replace('/ snipeit /', '', $errormessage); $errormessage = preg_replace('/ snipeit /', '', $errormessage);
print('<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> '.$errormessage.'</span>'); print('<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> '.$errormessage.'</span>');
} }
?> ?>
</div> </div>
@if ($field->field_encrypted) @if ($field->field_encrypted)