From e70dab64a295930feafe60f6fb3fd31cb5a8faa5 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 27 Jan 2016 20:39:19 -0800 Subject: [PATCH] Fixes #1686 - added notes to model --- app/config/version.php | 4 +- app/controllers/admin/ModelsController.php | 4 + .../2016_01_28_041048_add_notes_to_models.php | 32 +++ app/lang/en/general.php | 1 + app/models/Model.php | 10 + app/views/backend/models/edit.blade.php | 11 + app/views/backend/models/index.blade.php | 1 + app/views/backend/models/view.blade.php | 206 +++++++++--------- .../css/bootstrap/bootstrap-overrides.css | 1 - 9 files changed, 167 insertions(+), 103 deletions(-) create mode 100644 app/database/migrations/2016_01_28_041048_add_notes_to_models.php diff --git a/app/config/version.php b/app/config/version.php index 1f1f85cc3e..b6e11d80a8 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.1.0-4', - 'hash_version' => 'v2.1.0-4-g2d56240', + 'app_version' => 'v2.1.0-5', + 'hash_version' => 'v2.1.0-5-g9563cf4', ); \ No newline at end of file diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php index e80cb34a3b..6ba3e8ea2d 100755 --- a/app/controllers/admin/ModelsController.php +++ b/app/controllers/admin/ModelsController.php @@ -115,6 +115,7 @@ 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->note = e(Input::get('note')); $model->user_id = Sentry::getId(); if (Input::get('custom_fieldset')!='') { $model->fieldset_id = e(Input::get('custom_fieldset')); @@ -166,6 +167,7 @@ class ModelsController extends AdminController $model->category_id = e(Input::get('category_id')); $model->modelno = e(Input::get('modelno')); $model->user_id = Sentry::getUser()->id; + $model->note = e(Input::get('note')); $model->eol=0; if($model->save()) { @@ -243,6 +245,7 @@ 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->note = e(Input::get('note')); if (Input::get('custom_fieldset')=='') { $model->fieldset_id = null; } else { @@ -454,6 +457,7 @@ class ModelsController extends AdminController 'depreciation' => (($model->depreciation)&&($model->depreciation->id > 0)) ? $model->depreciation->name.' ('.$model->depreciation->months.')' : Lang::get('general.no_depreciation'), 'category' => ($model->category) ? $model->category->name : '', 'eol' => ($model->eol) ? $model->eol.' '.Lang::get('general.months') : '', + 'note' => $model->getNote(), 'actions' => $actions ); } diff --git a/app/database/migrations/2016_01_28_041048_add_notes_to_models.php b/app/database/migrations/2016_01_28_041048_add_notes_to_models.php new file mode 100644 index 0000000000..de922da180 --- /dev/null +++ b/app/database/migrations/2016_01_28_041048_add_notes_to_models.php @@ -0,0 +1,32 @@ +text('note')->nullable()->default(NULL); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('models', function ($table) { + $table->dropColumn('note'); + }); + } + +} diff --git a/app/lang/en/general.php b/app/lang/en/general.php index f1b31b208b..a4e0cc7c26 100755 --- a/app/lang/en/general.php +++ b/app/lang/en/general.php @@ -85,6 +85,7 @@ 'logout' => 'Logout', 'manufacturer' => 'Manufacturer', 'manufacturers' => 'Manufacturers', + 'markdown' => 'Github flavored markdown is allowed', 'model_no' => 'Model No.', 'months' => 'months', 'moreinfo' => 'More Info', diff --git a/app/models/Model.php b/app/models/Model.php index 5d548a0a0f..0935b13e1b 100755 --- a/app/models/Model.php +++ b/app/models/Model.php @@ -48,6 +48,16 @@ class Model extends Elegant return $this->belongsTo('CustomFieldset','fieldset_id'); } + public function getNote() { + + $Parsedown = new Parsedown(); + + if ($this->note) { + return $Parsedown->text(e($this->note)); + } + + } + /** * ----------------------------------------------- * BEGIN QUERY SCOPES diff --git a/app/views/backend/models/edit.blade.php b/app/views/backend/models/edit.blade.php index 653d2c559f..fdf910941b 100755 --- a/app/views/backend/models/edit.blade.php +++ b/app/views/backend/models/edit.blade.php @@ -117,6 +117,17 @@ + +
+ +
+ +

@lang('general.markdown')

+ + {{ $errors->first('note', '
:message') }} +
+
+ @if ($model->image)
diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php index 373abd1dd7..e581240d48 100755 --- a/app/views/backend/models/index.blade.php +++ b/app/views/backend/models/index.blade.php @@ -41,6 +41,7 @@ @lang('general.depreciation') @lang('general.category') @lang('general.eol') + @lang('general.notes') @lang('table.actions') diff --git a/app/views/backend/models/view.blade.php b/app/views/backend/models/view.blade.php index 29addc981e..0a6f884f9b 100755 --- a/app/views/backend/models/view.blade.php +++ b/app/views/backend/models/view.blade.php @@ -50,122 +50,128 @@ @endif - - @if (count($model->assets) > 0) - - - + + @if (count($model->assets) > 0) +
+ + - - - - - - - - - -
{{{ Lang::get('admin/companies/table.title') }}}{{Lang::get('general.id')}}{{Lang::get('general.name')}}{{Lang::get('general.asset_tag')}}{{Lang::get('admin/hardware/table.serial')}}{{Lang::get('general.user')}}{{ Lang::get('table.actions') }}
- @else -
-
- - @lang('general.no_results') -
-
- @endif + {{{ Lang::get('admin/companies/table.title') }}} + {{Lang::get('general.id')}} + {{Lang::get('general.name')}} + {{Lang::get('general.asset_tag')}} + {{Lang::get('admin/hardware/table.serial')}} + {{Lang::get('general.user')}} + {{ Lang::get('table.actions') }} + + + + @else +
+
+ + @lang('general.no_results') +
+
+ @endif -
+ - -
-
More Info:
- -
+ @if ($model->note) + Notes: +

{{ $model->getNote() }} +

+ @endif - @section('moar_scripts') - - - - - - - - @stop + @section('moar_scripts') + + + + + + + + @stop @stop diff --git a/public/assets/css/bootstrap/bootstrap-overrides.css b/public/assets/css/bootstrap/bootstrap-overrides.css index 3bfe0dbe1e..8a646254bb 100644 --- a/public/assets/css/bootstrap/bootstrap-overrides.css +++ b/public/assets/css/bootstrap/bootstrap-overrides.css @@ -313,7 +313,6 @@ textarea::-webkit-input-placeholder { .table td{ color: #526273; border-top-color: #edf2f7 !important; - vertical-align: middle !important; } .table th.align-right, .table td.align-right {