diff --git a/app/controllers/admin/CustomFieldsController.php b/app/controllers/admin/CustomFieldsController.php index 5161518705..de08ab802f 100644 --- a/app/controllers/admin/CustomFieldsController.php +++ b/app/controllers/admin/CustomFieldsController.php @@ -7,6 +7,7 @@ use Input; use Validator; use Redirect; use Model; +use Lang; class CustomFieldsController extends \BaseController { @@ -46,7 +47,7 @@ class CustomFieldsController extends \BaseController { $validator=Validator::make(Input::all(),$cfset->rules); if($validator->passes()) { $cfset->save(); - return Redirect::route("admin.custom_fields.show",[$cfset->id]); //redirect(["asdf" => "alskdjf"]); + return Redirect::route("admin.custom_fields.show",[$cfset->id])->with('success',Lang::get('admin/custom_fields/message.fieldset.create.success')); } else { return Redirect::back()->withInput()->withErrors($validator); } @@ -54,22 +55,18 @@ class CustomFieldsController extends \BaseController { public function associate($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"]); + return Redirect::route("admin.custom_fields.show",[$id])->withInput()->withErrors(['field_id' => Lang::get('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 "I assoced it. Results: $results"; - return Redirect::route("admin.custom_fields.show",[$id]); //redirect(["asdf" => "alskdjf"]); + + return Redirect::route("admin.custom_fields.show",[$id])->with("success",Lang::get('admin/custom_fields/message.field.create.assoc_success')); } public function createField() @@ -91,9 +88,9 @@ class CustomFieldsController extends \BaseController { $results=$field->save(); //return "postCreateField: $results"; if ($results) { - return Redirect::route("admin.custom_fields.index"); + return Redirect::route("admin.custom_fields.index")->with("success",Lang::get('admin/custom_fields/message.field.create.success')); } else { - return Redirect::back()->withInput()->with('error', "Failed to save?"); + return Redirect::back()->withInput()->with('error', Lang::get('admin/custom_fields/message.field.create.error')); } } else { return Redirect::back()->withInput()->withErrors($validator); @@ -108,7 +105,7 @@ class CustomFieldsController extends \BaseController { return Redirect::back()->withErrors(['message' => "Field is in-use"]); } else { $field->delete(); - return Redirect::route("admin.custom_fields.index")->with("success","Field Deleted"); + return Redirect::route("admin.custom_fields.index")->with("success",Lang::get('admin/custom_fields/message.field.delete.success')); } } @@ -181,10 +178,10 @@ class CustomFieldsController extends \BaseController { $models=Model::where("fieldset_id","=",$id); if($models->count()==0) { $fieldset->delete(); - return Redirect::route("admin.custom_fields.index")->with("success","Fieldset Deleted"); + return Redirect::route("admin.custom_fields.index")->with("success",Lang::get('admin/custom_fields/message.fieldset.delete.success')); } else { - return Redirect::route("admin.custom_fields.index")->with("error","Fieldset still in use"); //->with("models",$models); + return Redirect::route("admin.custom_fields.index")->with("error",Lang::get('admin/custom_fields/message.fieldset.delete.in_use')); //->with("models",$models); } } diff --git a/app/lang/en/admin/custom_fields/general.php b/app/lang/en/admin/custom_fields/general.php new file mode 100644 index 0000000000..4276b5932c --- /dev/null +++ b/app/lang/en/admin/custom_fields/general.php @@ -0,0 +1,10 @@ + 'Custom Fields', + 'field' => 'Field', + 'fieldset' => 'fieldset', + 'fieldset_name' => 'Fieldset Name', + 'required' => 'Required', + 'create_fieldset' => 'Create New Fieldset', +); diff --git a/app/lang/en/admin/custom_fields/message.php b/app/lang/en/admin/custom_fields/message.php new file mode 100644 index 0000000000..0d34afa9e8 --- /dev/null +++ b/app/lang/en/admin/custom_fields/message.php @@ -0,0 +1,57 @@ + array( + 'invalid' => 'That field does not exist.', + 'already_added' => 'Field already added', + + 'create' => array( + 'error' => 'Field was not created, please try again.', + 'success' => 'Field created successfully.', + 'assoc_success' => 'Field successfully added to fieldset.' + ), + + 'update' => array( + 'error' => 'Field was not updated, please try again', + 'success' => 'Field updated successfully.' + ), + + 'delete' => array( + 'confirm' => 'Are you sure you wish to delete this field?', + 'error' => 'There was an issue deleting the field. Please try again.', + 'success' => 'The field was deleted successfully.', + 'in_use' => 'Field is still in use.', + ) + + ), + + 'fieldset' => array( + + + + 'create' => array( + 'error' => 'Fieldset was not created, please try again.', + 'success' => 'Fieldset created successfully.' + ), + + 'update' => array( + 'error' => 'Fieldset was not updated, please try again', + 'success' => 'Fieldset updated successfully.' + ), + + 'delete' => array( + 'confirm' => 'Are you sure you wish to delete this fieldset?', + 'error' => 'There was an issue deleting the fieldset. Please try again.', + 'success' => 'The fieldset was deleted successfully.', + 'in_use' => 'Fieldset is still in use.', + ) + + ), + + + + + + +); diff --git a/app/lang/en/general.php b/app/lang/en/general.php index 8fa01f3f1a..2f1d7ff0ec 100755 --- a/app/lang/en/general.php +++ b/app/lang/en/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Activity Report', 'address' => 'Address', 'admin' => 'Admin', + 'add_seats' => 'Added seats', 'all_assets' => 'All Assets', 'all' => 'All', 'archived' => 'Archived', diff --git a/app/views/backend/custom_fields/create.blade.php b/app/views/backend/custom_fields/create.blade.php index 0da72e0719..3979db4f78 100644 --- a/app/views/backend/custom_fields/create.blade.php +++ b/app/views/backend/custom_fields/create.blade.php @@ -1,9 +1,51 @@ @extends('backend/layouts/default') + +{{-- Page title --}} +@section('title') + @lang('admin/custom_fields/general.create_fieldset') +@parent +@stop + +{{-- Page content --}} @section('content') - 'admin.custom_fields.store']) ?> - Name: {{Form::text("name",Input::old('name'))}}first('name'); ?>
- - -
{{ link_to_route('admin.custom_fields.index',"Back to Custom Fieldset List")}} +
+
+ + + @lang('general.back') +

+ @lang('admin/custom_fields/general.create_fieldset') +

+
+
+
+ +{{ Form::open(['route' => 'admin.custom_fields.store', 'class'=>'form-horizontal']) }} + + +
+ + +
+ + {{ $errors->first('name', '
:message') }} +
+
+ + + +
+ +
+ @lang('button.cancel') + +
+
+ + + +
+ @stop