From e3160957e6bf586006b213fe2ff26e001b076561 Mon Sep 17 00:00:00 2001 From: Chandu Date: Tue, 19 Nov 2013 21:37:01 -0500 Subject: [PATCH 1/7] Added confirmation popups for deletes --- app/views/backend/layouts/default.blade.php | 22 ++- public/assets/css/lib/alertify.bootstrap.css | 131 ++++++++++++++++++ public/assets/css/lib/alertify.core.css | 137 +++++++++++++++++++ public/assets/css/lib/alertify.default.css | 81 +++++++++++ public/assets/js/alertify.min.js | 2 + 5 files changed, 372 insertions(+), 1 deletion(-) create mode 100644 public/assets/css/lib/alertify.bootstrap.css create mode 100644 public/assets/css/lib/alertify.core.css create mode 100644 public/assets/css/lib/alertify.default.css create mode 100644 public/assets/js/alertify.min.js diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php index 58fb5484c2..ebdb0568de 100755 --- a/app/views/backend/layouts/default.blade.php +++ b/app/views/backend/layouts/default.blade.php @@ -26,12 +26,18 @@ + + + + > + @@ -235,6 +241,7 @@ + diff --git a/app/views/backend/licenses/index.blade.php b/app/views/backend/licenses/index.blade.php index 7bb590ef7f..49bf776707 100755 --- a/app/views/backend/licenses/index.blade.php +++ b/app/views/backend/licenses/index.blade.php @@ -57,7 +57,11 @@ Licenses :: @lang('button.edit') - @lang('button.delete') + @lang('button.delete') + + + + @endforeach diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php index 4813fb0574..6a43a6c257 100755 --- a/app/views/backend/locations/index.blade.php +++ b/app/views/backend/locations/index.blade.php @@ -42,7 +42,7 @@ Asset Depreciations :: {{ $location->city }}, {{ $location->state }} {{ $location->country }} @lang('button.edit') - @lang('button.delete') + @lang('button.delete') @endforeach diff --git a/app/views/backend/manufacturers/index.blade.php b/app/views/backend/manufacturers/index.blade.php index 67b0069049..4da51c70bb 100755 --- a/app/views/backend/manufacturers/index.blade.php +++ b/app/views/backend/manufacturers/index.blade.php @@ -36,7 +36,7 @@ Asset Manufacturers :: {{ $manufacturer->name }} @lang('button.edit') - @lang('button.delete') + @lang('button.delete') @endforeach diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php index c75e83546a..57530306d9 100755 --- a/app/views/backend/models/index.blade.php +++ b/app/views/backend/models/index.blade.php @@ -28,24 +28,21 @@ Asset Models :: @lang('admin/models/table.title') @lang('admin/models/table.modelnumber') @lang('admin/models/table.numassets') - @lang('admin/models/table.created_at') + @lang('admin/models/table.created_at') @lang('table.actions') @foreach ($models as $model) - {{ $model->name }} - - - - + {{ $model->name }} {{ $model->modelno }} {{ ($model->assets->count()) }} {{ $model->created_at->diffForHumans() }} @lang('button.edit') - @lang('button.delete') + @lang('button.delete') + @endforeach diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php index 51dfd0400d..9f9d6655b7 100755 --- a/app/views/backend/users/index.blade.php +++ b/app/views/backend/users/index.blade.php @@ -71,7 +71,8 @@ User Management :: @else @lang('button.edit') @if (Sentry::getId() !== $user->id) - @lang('button.delete') + @lang('button.delete') + @else @lang('button.delete') @endif From 97a69625ba6c3f449fe924cf6c799f7f58239b60 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 20 Nov 2013 00:57:03 -0500 Subject: [PATCH 4/7] Please submit your pull requests to develop - thanks! --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7a7319a539..4e530c7df7 100755 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,3 @@ # Contribution Guidelines -Please submit all issues and pull requests to the [snipe/snipe-it](http://github.com/snipe/snipe-it) repository! \ No newline at end of file +Please submit all issues and pull requests to the [snipe/snipe-it](http://github.com/snipe/snipe-it) repository in the develop branch! \ No newline at end of file From b00f3430cb000a700bc1dd49d12c8e7e1711b3d5 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 20 Nov 2013 00:57:21 -0500 Subject: [PATCH 5/7] Added a check where the system wouldn't blow up if asset isn't found --- app/views/backend/users/view.blade.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/views/backend/users/view.blade.php b/app/views/backend/users/view.blade.php index 677a360469..e17e4e810e 100644 --- a/app/views/backend/users/view.blade.php +++ b/app/views/backend/users/view.blade.php @@ -89,7 +89,13 @@ View User {{ $user->fullName() }} :: {{ $log->added_on }} {{ $log->action_type }} - {{ $log->assetlog->name }} + + @if (isset($log->assetlog->name)) + {{ $log->assetlog->name }} + @else + missing asset + @endif + {{ $log->adminlog->fullName() }} @endforeach From 080f38a89946c6620601db1820d57d66553c051e Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 20 Nov 2013 01:04:35 -0500 Subject: [PATCH 6/7] enable soft-deletes on assets --- ...11_20_055822_add_soft_delete_on_assets.php | 30 +++++++++++++++++++ app/models/Asset.php | 1 + app/models/License.php | 2 +- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 app/database/migrations/2013_11_20_055822_add_soft_delete_on_assets.php diff --git a/app/database/migrations/2013_11_20_055822_add_soft_delete_on_assets.php b/app/database/migrations/2013_11_20_055822_add_soft_delete_on_assets.php new file mode 100644 index 0000000000..24c444472f --- /dev/null +++ b/app/database/migrations/2013_11_20_055822_add_soft_delete_on_assets.php @@ -0,0 +1,30 @@ +softDeletes(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } + +} \ No newline at end of file diff --git a/app/models/Asset.php b/app/models/Asset.php index 6c5413cb88..58f3af8a35 100644 --- a/app/models/Asset.php +++ b/app/models/Asset.php @@ -3,6 +3,7 @@ class Asset extends Elegant { protected $table = 'assets'; + protected $softDelete = true; protected $rules = array( 'name' => 'required|min:3', 'asset_tag' => 'required|min:3|unique:assets', diff --git a/app/models/License.php b/app/models/License.php index fcad687647..ca8f60ee9b 100644 --- a/app/models/License.php +++ b/app/models/License.php @@ -9,7 +9,7 @@ class License extends Elegant { */ protected $table = 'assets'; - + protected $softDelete = true; protected $rules = array( 'name' => 'required|min:3', 'serial' => 'required|min:5', From fb9f0d837e88463687d3f33ea33ca84397614155 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 20 Nov 2013 01:05:55 -0500 Subject: [PATCH 7/7] More detailed modal confirm --- app/views/backend/assets/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/backend/assets/index.blade.php b/app/views/backend/assets/index.blade.php index ce63aadb51..aa490f45d0 100755 --- a/app/views/backend/assets/index.blade.php +++ b/app/views/backend/assets/index.blade.php @@ -62,7 +62,7 @@ Assets :: @lang('button.edit') - @lang('button.delete') + @lang('button.delete') @endforeach