ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
snipe
2015-12-30 15:47:00 -08:00
parent 8eb31a9a82 7c06cba647
commit 2f4e54c8a6
323 changed files with 5631 additions and 880 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/ModelsController.php
+17 -3
View File
@@ -82,7 +82,7 @@ class ModelsController extends AdminController
if ($validator->fails())
{
// The given data did not pass validation
return Redirect::back()->withInput()->with('error', Lang::get('admin/models/message.create.duplicate_set'));;
return Redirect::back()->withInput()->with('error', Lang::get('admin/models/message.create.duplicate_set'));
}
@@ -116,7 +116,11 @@ class ModelsController extends AdminController
$model->manufacturer_id = e(Input::get('manufacturer_id'));
$model->category_id = e(Input::get('category_id'));
$model->user_id = Sentry::getId();
$model->show_mac_address = e(Input::get('show_mac_address', '0'));
if (Input::get('custom_fieldset')!='') {
$model->fieldset_id = e(Input::get('custom_fieldset'));
}
//$model->show_mac_address = e(Input::get('show_mac_address', '0'));
if (Input::file('image')) {
@@ -239,7 +243,9 @@ class ModelsController extends AdminController
$model->modelno = e(Input::get('modelno'));
$model->manufacturer_id = e(Input::get('manufacturer_id'));
$model->category_id = e(Input::get('category_id'));
$model->show_mac_address = e(Input::get('show_mac_address', '0'));
if (Input::get('custom_fieldset')!='') {
$model->fieldset_id = e(Input::get('custom_fieldset'));
}
if (Input::file('image')) {
$image = Input::file('image');
@@ -375,6 +381,14 @@ class ModelsController extends AdminController
}
public function getCustomFields($modelId)
{
$model=Model::find($modelId);
return View::make("backend.models.custom_fields_form")->with("model",$model);
}
/**
* Get the JSON response for the bootstrap table list view
*