diff --git a/app/controllers/admin/ManufacturersController.php b/app/controllers/admin/ManufacturersController.php index a5e35fa6cc..d79035ed8c 100644 --- a/app/controllers/admin/ManufacturersController.php +++ b/app/controllers/admin/ManufacturersController.php @@ -34,9 +34,7 @@ class ManufacturersController extends AdminController { */ public function getCreate() { - // Show the page - $manufacturer_options = array('0' => 'Top Level') + Manufacturer::lists('name', 'id'); - return View::make('backend/manufacturers/edit')->with('manufacturer_options',$manufacturer_options)->with('manufacturer', new Manufacturer); + return View::make('backend/manufacturers/edit')->with('manufacturer', new Manufacturer); } diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php index 2a88d522f9..2bffa18ca8 100644 --- a/app/controllers/admin/ModelsController.php +++ b/app/controllers/admin/ModelsController.php @@ -6,6 +6,7 @@ use Lang; use Model; use Redirect; use Sentry; +use Depreciation; use Str; use Validator; use View; @@ -26,6 +27,153 @@ class ModelsController extends AdminController { return View::make('backend/models/index', compact('models')); } +/** + * Model create. + * + * @return View + */ + public function getCreate() + { + // Show the page + //$model_options = array('0' => 'Top Level') + Model::lists('name', 'id'); + //return View::make('backend/models/edit')->with('model_options',$model_options)->with('model',new Model); + $depreciation_list = array('' => 'Do Not Depreciate') + Depreciation::lists('name', 'id'); + return View::make('backend/models/edit')->with('depreciation_list',$depreciation_list)->with('model',new Model); + } + + + /** + * Model create form processing. + * + * @return Redirect + */ + public function postCreate() + { + // Declare the rules for the form validation + $rules = array( + 'name' => 'required|min:3', + ); + + // Create a new validator instance from our validation rules + $validator = Validator::make(Input::all(), $rules); + + // If validation fails, we'll exit the operation now. + if ($validator->fails()) + { + // Ooops.. something went wrong + return Redirect::back()->withInput()->withErrors($validator); + } + + // Create a new model + $model = new Model; + + // Update the model data + $model->name = e(Input::get('name')); + $model->modelno = e(Input::get('modelno')); + $model->depreciation_id = e(Input::get('depreciation_id')); + $model->user_id = Sentry::getId(); + + // Was the model created? + if($model->save()) + { + // Redirect to the new model page + return Redirect::to("assets/models")->with('success', Lang::get('admin/models/message.create.success')); + } + + // Redirect to the model create page + return Redirect::to('assets/models/create')->with('error', Lang::get('admin/models/message.create.error')); + } + + /** + * Model update. + * + * @param int $modelId + * @return View + */ + public function getEdit($modelId = null) + { + // Check if the model exists + if (is_null($model = Model::find($modelId))) + { + // Redirect to the blogs management page + return Redirect::to('assets/models')->with('error', Lang::get('admin/models/message.does_not_exist')); + } + + // Show the page + //$model_options = array('' => 'Top Level') + Model::lists('name', 'id'); + + $model_options = array('' => 'Top Level') + DB::table('models')->where('id', '!=', $modelId)->lists('name', 'id'); + return View::make('backend/models/edit', compact('model'))->with('model_options',$model_options); + } + + + /** + * Model update form processing page. + * + * @param int $modelId + * @return Redirect + */ + public function postEdit($modelId = null) + { + // Check if the blog post exists + if (is_null($model = Model::find($modelId))) + { + // Redirect to the blogs management page + return Redirect::to('admin/models')->with('error', Lang::get('admin/models/message.does_not_exist')); + } + + // Declare the rules for the form validation + $rules = array( + 'name' => 'required|min:3', + ); + + // Create a new validator instance from our validation rules + $validator = Validator::make(Input::all(), $rules); + + // If validation fails, we'll exit the operation now. + if ($validator->fails()) + { + // Ooops.. something went wrong + return Redirect::back()->withInput()->withErrors($validator); + } + + // Update the model data + $model->name = e(Input::get('name')); + $model->modelno = e(Input::get('modelno')); + $model->depreciation_id = e(Input::get('depreciation_id')); + + // Was the model updated? + if($model->save()) + { + // Redirect to the new model page + return Redirect::to("assets/models/$modelId/edit")->with('success', Lang::get('admin/models/message.update.success')); + } + + // Redirect to the model management page + return Redirect::to("assets/models/$modelId/edit")->with('error', Lang::get('admin/models/message.update.error')); + } + + /** + * Delete the given model. + * + * @param int $modelId + * @return Redirect + */ + public function getDelete($modelId) + { + // Check if the blog post exists + if (is_null($model = Model::find($modelId))) + { + // Redirect to the blogs management page + return Redirect::to('assets/models')->with('error', Lang::get('admin/models/message.not_found')); + } + + // Delete the blog post + $model->delete(); + + // Redirect to the blog posts management page + return Redirect::to('assets/models')->with('success', Lang::get('admin/models/message.delete.success')); + } } diff --git a/app/database/migrations/2013_11_16_084923_add_user_id_to_models.php b/app/database/migrations/2013_11_16_084923_add_user_id_to_models.php new file mode 100644 index 0000000000..94854eb0f3 --- /dev/null +++ b/app/database/migrations/2013_11_16_084923_add_user_id_to_models.php @@ -0,0 +1,30 @@ +integer('user_id'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } + +} \ No newline at end of file diff --git a/app/lang/en/admin/models/message.php b/app/lang/en/admin/models/message.php index 83256e2d91..497fd2bd12 100755 --- a/app/lang/en/admin/models/message.php +++ b/app/lang/en/admin/models/message.php @@ -2,21 +2,21 @@ return array( - 'does_not_exist' => 'Blog post does not exist.', + 'does_not_exist' => 'Model does not exist.', 'create' => array( - 'error' => 'Blog post was not created, please try again.', - 'success' => 'Blog post created successfully.' + 'error' => 'Model was not created, please try again.', + 'success' => 'Model created successfully.' ), 'update' => array( - 'error' => 'Blog post was not updated, please try again', - 'success' => 'Blog post updated successfully.' + 'error' => 'Model was not updated, please try again', + 'success' => 'Model updated successfully.' ), 'delete' => array( - 'error' => 'There was an issue deleting the blog post. Please try again.', - 'success' => 'The blog post was deleted successfully.' + 'error' => 'There was an issue deleting the model. Please try again.', + 'success' => 'The model was deleted successfully.' ) ); diff --git a/app/models/Manufacturer.php b/app/models/Manufacturer.php index ea5f40a458..c259c0f6c3 100644 --- a/app/models/Manufacturer.php +++ b/app/models/Manufacturer.php @@ -3,28 +3,16 @@ class Manufacturer extends Eloquent { /** - * Deletes a blog post and all the associated comments. + * Deletes a manufacturer * * @return bool */ public function delete() { - - - // Delete the blog post return parent::delete(); } - /** - * Returns a formatted post content entry, this ensures that - * line breaks are returned. - * - * @return string - */ - public function name() - { - return nl2br($this->content); - } - + + } diff --git a/app/routes.php b/app/routes.php index 717ba0d964..0b132c2601 100755 --- a/app/routes.php +++ b/app/routes.php @@ -29,6 +29,11 @@ Route::group(array('prefix' => 'assets'), function() Route::group(array('prefix' => 'models'), function() { Route::get('/', array('as' => 'models', 'uses' => 'Controllers\Admin\ModelsController@getIndex')); + Route::get('create', array('as' => 'create/model', 'uses' => 'Controllers\Admin\ModelsController@getCreate')); + Route::post('create', 'Controllers\Admin\ModelsController@postCreate'); + Route::get('{modelId}/edit', array('as' => 'update/model', 'uses' => 'Controllers\Admin\ModelsController@getEdit')); + Route::post('{modelId}/edit', 'Controllers\Admin\ModelsController@postEdit'); + Route::get('{modelId}/delete', array('as' => 'delete/model', 'uses' => 'Controllers\Admin\ModelsController@getDelete')); }); diff --git a/app/views/backend/blogs/create.blade.php b/app/views/backend/blogs/create.blade.php deleted file mode 100755 index bb36b21f26..0000000000 --- a/app/views/backend/blogs/create.blade.php +++ /dev/null @@ -1,109 +0,0 @@ -@extends('backend/layouts/default') - -{{-- Page title --}} -@section('title') -Create a New Blog Post :: -@parent -@stop - -{{-- Page content --}} -@section('content') - - - - - -
- - - - -
- -
- -
- -
- - {{ $errors->first('title', ':message') }} -
-
- - -
- -
-
- - {{ str_finish(URL::to('/'), '/') }} - - -
-
-
- - -
- -
- - {{ $errors->first('content', ':message') }} -
-
-
- - -
- -
- -
- - {{ $errors->first('meta-title', ':message') }} -
-
- - -
- -
- - {{ $errors->first('meta-description', ':message') }} -
-
- - -
- -
- - {{ $errors->first('meta-keywords', ':message') }} -
-
-
-
- - -
-
- Cancel - - - - -
-
-
-@stop diff --git a/app/views/backend/manufacturers/edit.blade.php b/app/views/backend/manufacturers/edit.blade.php index eb8568492e..1e3f98d39e 100755 --- a/app/views/backend/manufacturers/edit.blade.php +++ b/app/views/backend/manufacturers/edit.blade.php @@ -37,7 +37,7 @@
- +
{{ $errors->first('name', ':message') }} diff --git a/app/views/backend/models/create.blade.php b/app/views/backend/models/create.blade.php deleted file mode 100755 index 53940cf479..0000000000 --- a/app/views/backend/models/create.blade.php +++ /dev/null @@ -1,109 +0,0 @@ -@extends('backend/layouts/default') - -{{-- Page title --}} -@section('title') -Create a New Asset Model :: -@parent -@stop - -{{-- Page content --}} -@section('content') - - - - - -
- - - - -
- -
- -
- -
- - {{ $errors->first('title', ':message') }} -
-
- - -
- -
-
- - {{ str_finish(URL::to('/'), '/') }} - - -
-
-
- - -
- -
- - {{ $errors->first('content', ':message') }} -
-
-
- - -
- -
- -
- - {{ $errors->first('meta-title', ':message') }} -
-
- - -
- -
- - {{ $errors->first('meta-description', ':message') }} -
-
- - -
- -
- - {{ $errors->first('meta-keywords', ':message') }} -
-
-
-
- - -
-
- Cancel - - - - -
-
-
-@stop diff --git a/app/views/backend/models/edit.blade.php b/app/views/backend/models/edit.blade.php index d5e807cbeb..b024cfc7dc 100755 --- a/app/views/backend/models/edit.blade.php +++ b/app/views/backend/models/edit.blade.php @@ -2,7 +2,11 @@ {{-- Page title --}} @section('title') -Update Asset Model :: + @if ($model->id) + Update Model + @else + Create Model + @endif @parent @stop @@ -10,7 +14,11 @@ Update Asset Model :: @section('content') - - -
@@ -32,77 +34,42 @@ Update Asset Model ::
- -
- + +
+
- - {{ $errors->first('title', ':message') }} + + {{ $errors->first('name', ':message') }}
- -
- +
+
-
- - {{ str_finish(URL::to('/'), '/') }} - - -
+ + {{ $errors->first('modelno', ':message') }}
- -
- + + +
+
- - {{ $errors->first('content', ':message') }} + {{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $model->depreciation_id)) }} + {{ $errors->first('depreciation_id', ':message') }}
- -
- -
- -
- - {{ $errors->first('meta-title', ':message') }} -
-
- -
- -
- - {{ $errors->first('meta-description', ':message') }} -
-
- - -
- -
- - {{ $errors->first('meta-keywords', ':message') }} -
-
-
Cancel - - - - +
diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php index ed84d7e03e..94275cce35 100755 --- a/app/views/backend/models/index.blade.php +++ b/app/views/backend/models/index.blade.php @@ -13,7 +13,7 @@ Asset Models :: Asset Models
@@ -36,8 +36,8 @@ Asset Models :: {{ $model->modelno }} {{ $model->created_at->diffForHumans() }} - @lang('button.edit') - @lang('button.delete') + @lang('button.edit') + @lang('button.delete') @endforeach