DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add custom fields to modals in create asset

Browse source
This commit is contained in:
snipe 2016-04-23 03:12:31 -07:00
parent 97e218541b
commit 1b5ef695f2
2 changed files with 30 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/AssetModelsController.php
View file

@ -142,8 +142,6 @@ class AssetModelsController extends Controller
$settings=Input::all(); $settings=Input::all();
$settings['eol']=0; $settings['eol']=0;
//
$model->name=e(Input::get('name')); $model->name=e(Input::get('name'));
$model->manufacturer_id = e(Input::get('manufacturer_id')); $model->manufacturer_id = e(Input::get('manufacturer_id'));
@ -153,6 +151,12 @@ class AssetModelsController extends Controller
$model->note = e(Input::get('note')); $model->note = e(Input::get('note'));
$model->eol=0; $model->eol=0;
if (Input::get('fieldset_id')=='') {
$model->fieldset_id = null;
} else {
$model->fieldset_id = e(Input::get('fieldset_id'));
}
if ($model->save()) { if ($model->save()) {
return JsonResponse::create($model); return JsonResponse::create($model);
} else { } else {

49
resources/views/hardware/edit.blade.php
View file

@ -44,14 +44,14 @@
</div> </div>
<div class="dynamic-form-row"> <div class="dynamic-form-row">
<div class="col-md-4 col-xs-12"><label for="modal-modelno">{{ trans('general.model_no') }}*:</label></div> <div class="col-md-4 col-xs-12"><label for="modal-modelno">{{ trans('general.model_no') }}:</label></div>
<div class="col-md-8 col-xs-12"><input type='text' id='modal-modelno' class="form-control"></div> <div class="col-md-8 col-xs-12"><input type='text' id='modal-modelno' class="form-control"></div>
</div> </div>
<div class="dynamic-form-row"> <div class="dynamic-form-row">
<div class="col-md-4 col-xs-12"><label for="modal-statuslabel_types">{{ trans('admin/statuslabels/table.status_type') }}*: <div class="col-md-4 col-xs-12"><label for="modal-statuslabel_types">{{ trans('admin/statuslabels/table.status_type') }}*:
</label></div> </label></div>
<div class="col-md-8 col-xs-12">{{ Form::select('modal-statuslabel_types', $statuslabel_types, '', array('class'=>'select2', 'style'=>'width:100%','id' =>'modal-statuslabel_types')) }}</div> <div class="col-md-8 col-xs-12">{{ Form::select('modal-statuslabel_types', $statuslabel_types, '', array('class'=>'select2', 'style'=>'width:90%','id' =>'modal-statuslabel_types')) }}</div>
</div> </div>
<div class="dynamic-form-row"> <div class="dynamic-form-row">
@ -64,6 +64,11 @@
<div class="col-md-8 col-xs-12">{!! Form::countries('country', Input::old('country'), 'select2 country',"modal-country") !!}</div> <div class="col-md-8 col-xs-12">{!! Form::countries('country', Input::old('country'), 'select2 country',"modal-country") !!}</div>
</div> </div>
<div class="dynamic-form-row">
<div class="col-md-4 col-xs-12"><label for="modal-fieldset_id">{{ trans('admin/models/general.fieldset') }}:</label></div>
<div class="col-md-8 col-xs-12">{{ Form::select('custom_fieldset', \App\Helpers\Helper::customFieldsetList(),Input::old('custom_fieldset'), array('class'=>'select2', 'id'=>'modal-fieldset_id', 'style'=>'width:350px')) }}</div>
</div>
<div class="dynamic-form-row"> <div class="dynamic-form-row">
<div class="col-md-4 col-xs-12"><label for="modal-first_name">{{ trans('general.first_name') }}*:</label></div> <div class="col-md-4 col-xs-12"><label for="modal-first_name">{{ trans('general.first_name') }}*:</label></div>
<div class="col-md-8 col-xs-12"><input type='text' id='modal-first_name' class="form-control"></div> <div class="col-md-8 col-xs-12"><input type='text' id='modal-first_name' class="form-control"></div>
@ -391,23 +396,20 @@
@section('moar_scripts') @section('moar_scripts')
<script> <script>
function fetchCustomFields() {
var modelid=$('#model_select_id').val();
$(function() { if(modelid=='') {
$('#model_select_id').on("change",function () { $('#custom_fields_content').html("");
// console.warn("Model Id has changed!"); } else {
var modelid=$('#model_select_id').val(); $.get("{{config('app.url') }}/hardware/models/"+modelid+"/custom_fields",{_token: "{{ csrf_token() }}"},function (data) {
if(modelid=='') { $('#custom_fields_content').html(data);
$('#custom_fields_content').html(""); });
} else { }
// console.warn("Model ID is: "+modelid);
$.get("{{config('app.url') }}/hardware/models/"+modelid+"/custom_fields",{_token: "{{ csrf_token() }}"},function (data) {
// console.warn("Ajax call came back okay! Data is: "+data);
$('#custom_fields_content').html(data);
});
} }
});
}); $(function() {
$('#model_select_id').on("change",fetchCustomFields);
});
$(function() { $(function() {
user_add($(".status_id option:selected").val()); user_add($(".status_id option:selected").val());
@ -419,7 +421,6 @@ $(function() {
}); });
function user_add(status_id) { function user_add(status_id) {
console.log(status_id);
if(status_id!=''){ if(status_id!=''){
$(".status_spinner").css("display", "inline"); $(".status_spinner").css("display", "inline");
@ -444,17 +445,12 @@ $(function () {
$('#createModal').on("show.bs.modal",function (event) { $('#createModal').on("show.bs.modal",function (event) {
var link = $(event.relatedTarget); var link = $(event.relatedTarget);
// data-dependency="model" data-select="model_select_id"
model=link.data("dependency"); model=link.data("dependency");
select=link.data("select"); select=link.data("select");
var modal = $(this); var modal = $(this);
modal.find('.modal-title').text('Add a new ' + model); modal.find('.modal-title').text('Add a new ' + model);
//modal.find('.modal-body').text("This is where I should be AJAX'ing in the contents for the new " +model+" that you'are about to add!");
//use a spinner instead?
//$('.dynamic-form-element').hide();
//$('.modal-body input').parent().parent().hide();
//$('.modal-body select').parent().parent().hide();
$('.dynamic-form-row').hide(); $('.dynamic-form-row').hide();
function show_er(selector) { function show_er(selector) {
//$(selector).show().parent().show(); //$(selector).show().parent().show();
@ -466,6 +462,7 @@ $(function () {
show_er('#modal-manufacturer_id'); show_er('#modal-manufacturer_id');
show_er('#modal-category_id'); show_er('#modal-category_id');
show_er('#modal-modelno'); show_er('#modal-modelno');
show_er('#modal-fieldset_id');
break; break;
case 'user': case 'user':
@ -523,6 +520,8 @@ $(function () {
selector.options[selector.length]=new Option(name,id); selector.options[selector.length]=new Option(name,id);
selector.selectedIndex=selector.length-1; selector.selectedIndex=selector.length-1;
$(selector).trigger("change"); $(selector).trigger("change");
fetchCustomFields();
}).fail(function (result) { }).fail(function (result) {
//console.dir(result.responseJSON); //console.dir(result.responseJSON);
msg=result.responseJSON.error.message || result.responseJSON.error; msg=result.responseJSON.error.message || result.responseJSON.error;