mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-03-29 11:56:19 +00:00
Code Issues Projects Releases Wiki Activity

Use updated redirect() reference

Browse Source
This commit is contained in:
snipe
2016-04-28 21:06:41 -07:00
parent 8dd0e72284
commit ba01b20ad4
23 changed files with 375 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Http/Controllers/CustomFieldsController.php
View File

@ -70,9 +70,9 @@ class CustomFieldsController extends Controller
$validator=Validator::make(Input::all(), $cfset->rules);
if ($validator->passes()) {
$cfset->save();
return Redirect::route("admin.custom_fields.show", [$cfset->id])->with('success', trans('admin/custom_fields/message.fieldset.create.success'));
return redirect()->route("admin.custom_fields.show", [$cfset->id])->with('success', trans('admin/custom_fields/message.fieldset.create.success'));
} else {
return Redirect::back()->withInput()->withErrors($validator);
return redirect()->back()->withInput()->withErrors($validator);
}
}
@ -90,13 +90,13 @@ class CustomFieldsController extends Controller
foreach ($set->fields as $field) {
if ($field->id == Input::get('field_id')) {
return Redirect::route("admin.custom_fields.show", [$id])->withInput()->withErrors(['field_id' => trans('admin/custom_fields/message.field.already_added')]);
return redirect()->route("admin.custom_fields.show", [$id])->withInput()->withErrors(['field_id' => trans('admin/custom_fields/message.field.already_added')]);
}
}
$results=$set->fields()->attach(Input::get('field_id'), ["required" => (Input::get('required') == "on"),"order" => Input::get('order')]);
return Redirect::route("admin.custom_fields.show", [$id])->with("success", trans('admin/custom_fields/message.field.create.assoc_success'));
return redirect()->route("admin.custom_fields.show", [$id])->with("success", trans('admin/custom_fields/message.field.create.assoc_success'));
}
@ -138,12 +138,12 @@ class CustomFieldsController extends Controller
$results=$field->save();
//return "postCreateField: $results";
if ($results) {
return Redirect::route("admin.custom_fields.index")->with("success", trans('admin/custom_fields/message.field.create.success'));
return redirect()->route("admin.custom_fields.index")->with("success", trans('admin/custom_fields/message.field.create.success'));
} else {
return Redirect::back()->withInput()->with('error', trans('admin/custom_fields/message.field.create.error'));
return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.field.create.error'));
}
} else {
return Redirect::back()->withInput()->withErrors($validator);
return redirect()->back()->withInput()->withErrors($validator);
}
}
@ -159,10 +159,10 @@ class CustomFieldsController extends Controller
$field=CustomField::find($field_id);
if ($field->fieldset->count()>0) {
return Redirect::back()->withErrors(['message' => "Field is in-use"]);
return redirect()->back()->withErrors(['message' => "Field is in-use"]);
} else {
$field->delete();
return Redirect::route("admin.custom_fields.index")->with("success", trans('admin/custom_fields/message.field.delete.success'));
return redirect()->route("admin.custom_fields.index")->with("success", trans('admin/custom_fields/message.field.delete.success'));
}
}
@ -245,9 +245,9 @@ class CustomFieldsController extends Controller
$models = AssetModel::where("fieldset_id", "=", $id);
if ($models->count()==0) {
$fieldset->delete();
return Redirect::route("admin.custom_fields.index")->with("success", trans('admin/custom_fields/message.fieldset.delete.success'));
return redirect()->route("admin.custom_fields.index")->with("success", trans('admin/custom_fields/message.fieldset.delete.success'));
} else {
return Redirect::route("admin.custom_fields.index")->with("error", trans('admin/custom_fields/message.fieldset.delete.in_use')); //->with("models",$models);
return redirect()->route("admin.custom_fields.index")->with("error", trans('admin/custom_fields/message.fieldset.delete.in_use')); //->with("models",$models);
}
}
}