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

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2018-07-19 10:40:38 -07:00
parent 53fab3e9ba 7ebb7876c4
commit bbb15d610f
4 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/CustomFieldsController.php
View file

@ -87,7 +87,7 @@ class CustomFieldsController extends Controller
]);
if (!in_array(Input::get('format'), array_keys(CustomField::$PredefinedFormats))) {
if ($request->has("custom_format")) {
$field->format = e($request->get("custom_format"));
} else {
$field->format = e($request->get("format"));
@ -96,7 +96,6 @@ class CustomFieldsController extends Controller
if ($field->save()) {
return redirect()->route("fields.index")->with("success", trans('admin/custom_fields/message.field.create.success'));
} else {
// dd($field);
return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.field.create.error'));
}

2
app/Notifications/CheckoutConsumableNotification.php
View file

@ -80,7 +80,7 @@ class CheckoutConsumableNotification extends Notification
/**
* Send an email if an email should be sent at checkin/checkout
*/
if ($this->item->checkin_email()) {
if ((method_exists($this->item, 'checkin_email')) && ($this->item->checkin_email())) {
$notifyBy[1] = 'mail';
}

47
resources/views/categories/edit.blade.php
View file

@ -32,41 +32,52 @@
</div>
<!-- Use default checkbox -->
<div class="checkbox col-md-offset-3">
<label>
<div class="form-group">
<div class="col-md-3">
</div>
<div class="col-md-9">
@if ($snipeSettings->default_eula_text!='')
{{ Form::checkbox('use_default_eula', '1', Input::old('use_default_eula', $item->use_default_eula)) }}
{!! trans('admin/categories/general.use_default_eula') !!}
{{ Form::checkbox('use_default_eula', '1', old('use_default_eula', $item->use_default_eula), ['class'=>'minimal']) }}
{!! trans('admin/categories/general.use_default_eula') !!}
@else
{{ Form::checkbox('use_default_eula', '0', Input::old('use_default_eula'), array('disabled' => 'disabled')) }}
{!! trans('admin/categories/general.use_default_eula_disabled') !!}
@endif
<div class="icheckbox disabled">
{{ Form::checkbox('use_default_eula', '0', old('use_default_eula'), ['class'=>'disabled minimal','disabled' => 'disabled']) }}
</label>
{!! trans('admin/categories/general.use_default_eula_disabled') !!}
</div>
@endif
</div>
</div>
<!-- Require Acceptance -->
<div class="checkbox col-md-offset-3">
<label>
{{ Form::checkbox('require_acceptance', '1', Input::old('require_acceptance', $item->require_acceptance)) }}
<div class="form-group">
<div class="col-md-3">
</div>
<div class="col-md-9">
{{ Form::checkbox('require_acceptance', '1', old('require_acceptance', $item->require_acceptance), ['class'=>'minimal']) }}
{{ trans('admin/categories/general.require_acceptance') }}
</label>
</div>
</div>
<!-- Email on Checkin -->
<div class="checkbox col-md-offset-3">
<label>
{{ Form::checkbox('checkin_email', '1', Input::old('checkin_email', $item->checkin_email)) }}
<div class="form-group">
<div class="col-md-3">
</div>
<div class="col-md-9">
{{ Form::checkbox('checkin_email', '1', old('checkin_email', $item->checkin_email), ['class'=>'minimal']) }}
{{ trans('admin/categories/general.checkin_email') }}
</label>
</div>
</div>
<!-- Image -->
@if ($item->image)
<div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
<label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
<div class="col-md-5">
<div class="col-md-9">
{{ Form::checkbox('image_delete') }}
<img src="{{ url('/') }}/uploads/categories/{{ $item->image }}" />
{!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}

2
resources/views/partials/forms/edit/image-upload.blade.php
View file

@ -1,6 +1,6 @@
<div class="form-group {{ $errors->has('image') ? 'has-error' : '' }}">
<label class="col-md-3 control-label" for="image">{{ trans('general.image_upload') }}</label>
<div class="col-md-5">
<div class="col-md-9">
<label class="btn btn-default">
{{ trans('button.select_file') }}
<input type="file" name="image" id="uploadFile" data-maxsize="{{ \App\Helpers\Helper::file_upload_max_size() }}" accept="image/gif,image/jpeg,image/png,image/svg" style="display:none">