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

Fix to adding same custom field twice. Helps with #1397. Requires

Browse Source 
PR #1408 to be merged first.
This commit is contained in:
Brady Wetherington
2015-11-29 13:16:03 -08:00
parent beeb28bf09
commit 418be7f5de
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/CustomFieldsController.php
+21 -2
View File
@@ -53,8 +53,19 @@ class CustomFieldsController extends \BaseController {
public function associate($id)
{
print "ID is: $id";
//print "ID is: $id";
$set=CustomFieldset::find($id);
//print_r($set->fields());
foreach($set->fields AS $field) {
//print_r($field);
//print "Field ID of this particular field is:".$field->id.", and we are checking for: ".Input::get('field_id');
if($field->id == Input::get('field_id')) {
//print "I want to redirect back in failure";
//exit(-2);
return Redirect::route("admin.custom_fields.show",[$id])->withInput()->withErrors(['field_id' => "Field already added"]);
}
}
exit(-1);
$results=$set->fields()->attach(Input::get('field_id'),["required" => (Input::get('required') == "on"),"order" => Input::get('order')]);
//return "I assoced it. Results: $results";
return Redirect::route("admin.custom_fields.show",[$id]); //redirect(["asdf" => "alskdjf"]);
@@ -101,13 +112,21 @@ class CustomFieldsController extends \BaseController {
//print_r($parameters);
//
$custom_fields_list=["" => "Add New Field to Fieldset"] + CustomField::lists("name","id");
// print_r($custom_fields_list);
$maxid=0;
foreach($cfset->fields AS $field) {
// print "Looking for: ".$field->id;
if($field->pivot->order > $maxid) {
$maxid=$field->pivot->order;
}
if(isset($custom_fields_list[$field->id])) {
// print "Found ".$field->id.", so removing it.<br>";
unset($custom_fields_list[$field->id]);
}
}
return View::make("backend.custom_fields.show")->with("custom_fieldset",$cfset)->with("maxid",$maxid+1);
return View::make("backend.custom_fields.show")->with("custom_fieldset",$cfset)->with("maxid",$maxid+1)->with("custom_fields_list",$custom_fields_list);
}