From 9fe2a7f81d8ab04c3c8a3841fef1b0cc07923673 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 12 Dec 2017 03:39:55 -0800
Subject: [PATCH 01/13] Removed duplicate log entry on asset creation

---
 app/Http/Controllers/AssetsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index a2598dca63..4fc6d8d2b4 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -219,7 +219,7 @@ class AssetsController extends Controller
 
             // Was the asset created?
         if ($asset->save()) {
-            $asset->logCreate();
+
 
             if (request('assigned_user')) {
                 $target = User::find(request('assigned_user'));

From 88ca852dcf65dcf2ac9335e726aa9aff33d8a444 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 12 Dec 2017 03:40:04 -0800
Subject: [PATCH 02/13] Cleaned up asset observer

---
 app/Observers/AssetObserver.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/Observers/AssetObserver.php b/app/Observers/AssetObserver.php
index 3066057d1c..6e2db974b0 100644
--- a/app/Observers/AssetObserver.php
+++ b/app/Observers/AssetObserver.php
@@ -18,8 +18,9 @@ class AssetObserver
     public function updating(Asset $asset)
     {
 
-
-        if ((isset($asset->getOriginal()['assigned_to'])) && ($asset->getAttributes()['assigned_to'] == $asset->getOriginal()['assigned_to'])
+        // If the asset isn't being checked out or audited, log the update.
+        // (Those other actions already create log entries.)
+        if (($asset->getAttributes()['assigned_to'] == $asset->getOriginal()['assigned_to'])
             && ($asset->getAttributes()['next_audit_date'] == $asset->getOriginal()['next_audit_date'])
             && ($asset->getAttributes()['last_checkout'] == $asset->getOriginal()['last_checkout'])
             && ($asset->getAttributes()['status_id'] == $asset->getOriginal()['status_id']))
@@ -30,6 +31,13 @@ class AssetObserver
             $logAction->created_at =  date("Y-m-d H:i:s");
             $logAction->user_id = Auth::id();
             $logAction->logaction('update');
+
+        } else {
+            \Log::debug('Something else happened');
+            \Log::debug($asset->getOriginal()['assigned_to'].' == '.$asset->getAttributes()['assigned_to']);
+            \Log::debug($asset->getOriginal()['next_audit_date'].' == '.$asset->getAttributes()['next_audit_date']);
+            \Log::debug($asset->getOriginal()['last_checkout'].' == '.$asset->getAttributes()['last_checkout']);
+            \Log::debug($asset->getOriginal()['status_id'].' == '.$asset->getAttributes()['status_id']);
         }
 
     }

From 1d543f83d4e1167e70882518509242bac8dfa82f Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 12 Dec 2017 04:31:53 -0800
Subject: [PATCH 03/13] Added line spacing between unstyled lists

---
 resources/views/hardware/view.blade.php | 43 +++++++++++++------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 6ee49939d6..b222bb2555 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -143,29 +143,32 @@
                     <tr>
                       <td>{{ trans('admin/hardware/form.manufacturer') }}</td>
                       <td>
-                      @can('view', \App\Models\Manufacturer::class)
-                        <a href="{{ route('manufacturers.show', $asset->model->manufacturer->id) }}">
-                        {{ $asset->model->manufacturer->name }}
-                        </a>
-                      @else
-                        {{ $asset->model->manufacturer->name }}
-                      @endcan
+                        <ul class="list-unstyled" style="line-height: 25px;">
+                        @can('view', \App\Models\Manufacturer::class)
 
-                        @if ($asset->model->manufacturer->url)
-                            <br><i class="fa fa-globe"></i> <a href="{{ $asset->model->manufacturer->url }}">{{ $asset->model->manufacturer->url }}</a>
-                        @endif
+                          <li><a href="{{ route('manufacturers.show', $asset->model->manufacturer->id) }}">
+                          {{ $asset->model->manufacturer->name }}</li>
+                          </a>
+                        @else
+                         <li> {{ $asset->model->manufacturer->name }}</li>
+                        @endcan
 
-                        @if ($asset->model->manufacturer->support_url)
-                            <br><i class="fa fa-life-ring"></i> <a href="{{ $asset->model->manufacturer->support_url }}">{{ $asset->model->manufacturer->support_url }}</a>
-                          @endif
+                      @if ($asset->model->manufacturer->url)
+                            <li><i class="fa fa-globe"></i> <a href="{{ $asset->model->manufacturer->url }}">{{ $asset->model->manufacturer->url }}</a></li>
+                      @endif
 
-                          @if ($asset->model->manufacturer->support_phone)
-                            <br><i class="fa fa-phone"></i> {{ $asset->model->manufacturer->support_phone }}
-                          @endif
+                      @if ($asset->model->manufacturer->support_url)
+                            <li><i class="fa fa-life-ring"></i> <a href="{{ $asset->model->manufacturer->support_url }}">{{ $asset->model->manufacturer->support_url }}</a></li>
+                       @endif
 
-                          @if ($asset->model->manufacturer->support_email)
-                            <br><i class="fa fa-envelope"></i> <a href="mailto:{{ $asset->model->manufacturer->support_email }}">{{ $asset->model->manufacturer->support_email }}</a>
-                          @endif
+                       @if ($asset->model->manufacturer->support_phone)
+                            <li><i class="fa fa-phone"></i> {{ $asset->model->manufacturer->support_phone }}</li>
+                       @endif
+
+                       @if ($asset->model->manufacturer->support_email)
+                            <li><i class="fa fa-envelope"></i> <a href="mailto:{{ $asset->model->manufacturer->support_email }}">{{ $asset->model->manufacturer->support_email }}</a></li>
+                       @endif
+                        </ul>
                       </td>
                     </tr>
                     @endif
@@ -426,7 +429,7 @@
                   {!! $asset->assignedTo->present()->glyph() . ' ' .$asset->assignedTo->present()->nameUrl() !!}
                 </p>
 
-                <ul class="list-unstyled">
+                  <ul class="list-unstyled" style="line-height: 25px;">
                   @if ((isset($asset->assignedTo->email)) && ($asset->assignedTo->email!=''))
                     <li><i class="fa fa-envelope-o"></i> <a href="mailto:{{ $asset->assignedTo->email }}">{{ $asset->assignedTo->email }}</a></li>
                   @endif

From 612f23f6e0a77334a3f70ad2d2f01354e0a5fde3 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 12 Dec 2017 04:59:28 -0800
Subject: [PATCH 04/13] Added #2893 - track changes on asset edits

---
 .../Transformers/ActionlogsTransformer.php    |  1 +
 app/Observers/AssetObserver.php               | 16 ++++++++--
 .../2017_12_12_033618_add_actionlog_meta.php  | 32 +++++++++++++++++++
 resources/views/hardware/view.blade.php       | 14 +++++---
 .../views/partials/bootstrap-table.blade.php  | 13 ++++++++
 resources/views/reports/activity.blade.php    |  1 +
 6 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100644 database/migrations/2017_12_12_033618_add_actionlog_meta.php

diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php
index ea7b615617..3bb9142083 100644
--- a/app/Http/Transformers/ActionlogsTransformer.php
+++ b/app/Http/Transformers/ActionlogsTransformer.php
@@ -54,6 +54,7 @@ class ActionlogsTransformer
 
             'note'          => ($actionlog->note) ? e($actionlog->note): null,
             'signature_file'   => ($actionlog->accept_signature) ? route('log.signature.view', ['filename' => $actionlog->accept_signature ]) : null,
+            'log_meta'          => ($actionlog->log_meta) ? json_decode($actionlog->log_meta): null,
 
 
         ];
diff --git a/app/Observers/AssetObserver.php b/app/Observers/AssetObserver.php
index 6e2db974b0..7cac06ed29 100644
--- a/app/Observers/AssetObserver.php
+++ b/app/Observers/AssetObserver.php
@@ -22,22 +22,32 @@ class AssetObserver
         // (Those other actions already create log entries.)
         if (($asset->getAttributes()['assigned_to'] == $asset->getOriginal()['assigned_to'])
             && ($asset->getAttributes()['next_audit_date'] == $asset->getOriginal()['next_audit_date'])
-            && ($asset->getAttributes()['last_checkout'] == $asset->getOriginal()['last_checkout'])
-            && ($asset->getAttributes()['status_id'] == $asset->getOriginal()['status_id']))
+            && ($asset->getAttributes()['last_checkout'] == $asset->getOriginal()['last_checkout']))
         {
+            $changed = [];
+
+            foreach ($asset->getOriginal() as $key => $value) {
+                if ($asset->getOriginal()[$key] != $asset->getAttributes()[$key]) {
+                    $changed[$key]['old'] = $asset->getOriginal()[$key];
+                    $changed[$key]['new'] = $asset->getAttributes()[$key];
+                }
+            }
+
+
             $logAction = new Actionlog();
             $logAction->item_type = Asset::class;
             $logAction->item_id = $asset->id;
             $logAction->created_at =  date("Y-m-d H:i:s");
             $logAction->user_id = Auth::id();
+            $logAction->log_meta = json_encode($changed);
             $logAction->logaction('update');
 
         } else {
+
             \Log::debug('Something else happened');
             \Log::debug($asset->getOriginal()['assigned_to'].' == '.$asset->getAttributes()['assigned_to']);
             \Log::debug($asset->getOriginal()['next_audit_date'].' == '.$asset->getAttributes()['next_audit_date']);
             \Log::debug($asset->getOriginal()['last_checkout'].' == '.$asset->getAttributes()['last_checkout']);
-            \Log::debug($asset->getOriginal()['status_id'].' == '.$asset->getAttributes()['status_id']);
         }
 
     }
diff --git a/database/migrations/2017_12_12_033618_add_actionlog_meta.php b/database/migrations/2017_12_12_033618_add_actionlog_meta.php
new file mode 100644
index 0000000000..a9a662fa1a
--- /dev/null
+++ b/database/migrations/2017_12_12_033618_add_actionlog_meta.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddActionlogMeta extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('action_logs', function (Blueprint $table) {
+            $table->text('log_meta')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('action_logs', function (Blueprint $table) {
+            $table->dropColumn('log_meta');
+        });
+    }
+}
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index b222bb2555..8382a28bef 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -619,24 +619,28 @@
                       class="table table-striped snipe-table"
                       name="assetHistory"
                       id="table"
+                      class="table table-striped snipe-table"
                       data-sort-order="desc"
-                      data-height="400"
+                      data-show-columns="true"
+                      data-cookie-id-table="asset-history"
                       data-url="{{ route('api.activity.index', ['item_id' => $asset->id, 'item_type' => 'asset']) }}">
                 <thead>
                 <tr>
                   <th data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter"></th>
                   <th class="col-sm-2" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
-                  <th class="col-sm-2" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
-                  <th class="col-sm-2" data-field="action_type">{{ trans('general.action') }}</th>
+                  <th class="col-sm-1" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
+                  <th class="col-sm-1" data-field="action_type">{{ trans('general.action') }}</th>
                   <th class="col-sm-2" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
                   <th class="col-sm-2" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
                   <th class="col-sm-2" data-field="note">{{ trans('general.notes') }}</th>
                   @if  ($snipeSettings->require_accept_signature=='1')
-                    <th class="col-md-3" data-field="signature_file" data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
+                    <th class="col-md-3" data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
                   @endif
+                  <th class="col-sm-2" data-field="log_meta" data-visible="false" data-formatter="changeLogFormatter">Changed</th>
                 </tr>
                 </thead>
               </table>
+
             </div>
           </div> <!-- /.row -->
         </div> <!-- /.tab-pane history -->
@@ -676,7 +680,7 @@
                   <tr>
                     <th class="col-md-4">{{ trans('general.notes') }}</th>
                     <th class="col-md-2"></th>
-                    <th class="col-md-4"><span class="line"></span>{{ trans('general.file_name') }}</th>
+                    <th class="col-md-4">{{ trans('general.file_name') }}</th>
                     <th class="col-md-2"></th>
                     <th class="col-md-2"></th>
                   </tr>
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 1f78566ad1..d049a5c233 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -395,6 +395,19 @@
         }
     }
 
+
+
+    function changeLogFormatter(value) {
+        var result = '';
+            for (var index in value) {
+                result += index + ': <del>' + value[index].old + '</del>  <i class="fa fa-long-arrow-right" aria-hidden="true"></i> ' + value[index].new + '<br>'
+            }
+
+        return result;
+
+    }
+
+
     function deployedLocationFormatter(row, value) {
         if ((row) && (row!=undefined)) {
             return '<a href="{{ url('/') }}/locations/' + row.id + '"> ' + row.name + '</a>';
diff --git a/resources/views/reports/activity.blade.php b/resources/views/reports/activity.blade.php
index 755266d017..4fba5715de 100644
--- a/resources/views/reports/activity.blade.php
+++ b/resources/views/reports/activity.blade.php
@@ -32,6 +32,7 @@
                             <th class="col-sm-3" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
                             <th class="col-sm-2" data-field="target" data-formatter="polymorphicItemFormatter">To</th>
                             <th class="col-sm-1" data-field="note">{{ trans('general.notes') }}</th>
+                            <th class="col-sm-2" data-field="log_meta" data-visible="false" data-formatter="changeLogFormatter">Changed</th>
                         </tr>
                     </thead>
                 </table>

From e4ab4024c5f84485c69f1516058b92acb20824f5 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 12 Dec 2017 05:10:13 -0800
Subject: [PATCH 05/13] Added - changelog searchable in history tab

---
 app/Models/Actionlog.php                | 3 ++-
 resources/views/hardware/view.blade.php | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Models/Actionlog.php b/app/Models/Actionlog.php
index 36603b4bad..4c126bb387 100755
--- a/app/Models/Actionlog.php
+++ b/app/Models/Actionlog.php
@@ -218,7 +218,8 @@ class Actionlog extends SnipeModel
                         $query->where('companies.name', 'LIKE', '%'.$search.'%');
                     });
                 })->orWhere('action_type', 'LIKE', '%'.$search.'%')
-                    ->orWhere('note', 'LIKE', '%'.$search.'%');
+                    ->orWhere('note', 'LIKE', '%'.$search.'%')
+                    ->orWhere('log_meta', 'LIKE', '%'.$search.'%');
             }
 
         });
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 8382a28bef..638e94d7f3 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -617,11 +617,14 @@
             <div class="col-md-12">
               <table
                       class="table table-striped snipe-table"
-                      name="assetHistory"
+                      name="asset-history"
                       id="table"
                       class="table table-striped snipe-table"
                       data-sort-order="desc"
                       data-show-columns="true"
+                      data-search="true"
+                      data-cookie="true"
+                      data-show-refresh="true"
                       data-cookie-id-table="asset-history"
                       data-url="{{ route('api.activity.index', ['item_id' => $asset->id, 'item_type' => 'asset']) }}">
                 <thead>

From aff93d8f2b5a4a3d0966dccff2689ae1d3781d38 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 12 Dec 2017 05:43:06 -0800
Subject: [PATCH 06/13] Fixed #4589 - Licence deployed to asset issue

---
 app/Http/Controllers/LicensesController.php |  2 +-
 resources/views/licenses/view.blade.php     | 26 ++++++++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/LicensesController.php b/app/Http/Controllers/LicensesController.php
index 559f979fad..bfbcbb3b69 100755
--- a/app/Http/Controllers/LicensesController.php
+++ b/app/Http/Controllers/LicensesController.php
@@ -315,7 +315,7 @@ class LicensesController extends Controller
                 $licenseSeat->asset_id = $request->input('asset_id');
 
                 // Override asset's assigned user if available
-                if ($target->assigned_to!='') {
+                if ($target->checkedOutToUser()) {
                     $licenseSeat->assigned_to =  $target->assigned_to;
                 }
 
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 6ee5ffc7c9..dc1bee4c88 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -56,34 +56,44 @@
                         <td>Seat {{ $count }} </td>
                         <td>
                           @if (($licensedto->user) && ($licensedto->deleted_at == NULL))
+
                             @can('users.view')
                               <a href="{{ route('users.show', $licensedto->assigned_to) }}">
+                                <i class="fa fa-user"></i>
                                 {{ $licensedto->user->present()->fullName() }}
                               </a>
                             @else
+                              <i class="fa fa-user"></i>
                               {{ $licensedto->user->present()->fullName() }}
                             @endcan
+
                           @elseif (($licensedto->user) && ($licensedto->deleted_at != NULL))
+
                             <del>{{ $licensedto->user->present()->fullName() }}</del>
-                          @elseif ($licensedto->asset)
-                            @if ($licensedto->asset->assigned_to != 0)
-                              @can('users.view')
-                                {!!  $licensedto->asset->assignedTo->present()->nameUrl()  !!}
-                              @else
-                                {{ $licensedto->asset->assignedTo->present()->name() }}
-                              @endcan
-                            @endif
+
                           @endif
                         </td>
                         <td>
                           @if ($licensedto->asset)
+
                             @can('view', $licensedto->asset)
                               <a href="{{ route('hardware.show', $licensedto->asset_id) }}">
+                                <i class="fa fa-barcode"></i>
                                 {{ $licensedto->asset->name }} {{ $licensedto->asset->asset_tag }}
                               </a>
                             @else
+                              <i class="fa fa-barcode"></i>
                               {{ $licensedto->asset->name }} {{ $licensedto->asset->asset_tag }}
                             @endcan
+
+                              @if ($licensedto->asset->location)
+                                @can('locations.view')
+                                  ({!!  $licensedto->asset->location->present()->nameUrl()  !!})
+                                @else
+                                  ({{ $licensedto->asset->location->present()->name() }})
+                                @endcan
+                              @endif
+
                           @endif
                         </td>
                         <td>

From 4ce91a4f5d8976dd94bd0ebd7f0535704aa5bce2 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 12 Dec 2017 06:26:37 -0800
Subject: [PATCH 07/13] Fixed namespace gate for components - related to #4282

---
 app/Http/Controllers/Api/ComponentsController.php | 2 +-
 resources/views/layouts/default.blade.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.php
index 4e7a3c4ed7..894d0daa17 100644
--- a/app/Http/Controllers/Api/ComponentsController.php
+++ b/app/Http/Controllers/Api/ComponentsController.php
@@ -149,7 +149,7 @@ class ComponentsController extends Controller
     */
     public function getAssets(Request $request, $id)
     {
-        $this->authorize('index', Asset::class);
+        $this->authorize('view', \App\Models\Asset::class);
         
         $component = Component::findOrFail($id);
         $assets = $component->assets();
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index f896bbb383..59d7e08ad7 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -479,7 +479,7 @@
                 </a>
               </li>
               @endcan
-              @can('index', \App\Models\Consumable::class)
+              @can('view', \App\Models\Component::class)
             <li{!! (Request::is('consunmables*') ? ' class="active"' : '') !!}>
                 <a href="{{ url('consumables') }}">
                   <i class="fa fa-tint"></i>

From 9179b6d9c4ceba4ab8f2a20bb9d7d0b8c4c3694a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 12 Dec 2017 06:49:04 -0800
Subject: [PATCH 08/13] Improved - disallow delete through the GUI if asset
 model has assets associated

(We prevent this on the backend anyway, but this makes for nicer UI)
---
 app/Http/Transformers/AssetModelsTransformer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php
index 8c94f00577..f9ba38160e 100644
--- a/app/Http/Transformers/AssetModelsTransformer.php
+++ b/app/Http/Transformers/AssetModelsTransformer.php
@@ -53,7 +53,7 @@ class AssetModelsTransformer
 
         $permissions_array['available_actions'] = [
             'update' => (Gate::allows('update', AssetModel::class) && ($assetmodel->deleted_at==''))  ? true : false,
-            'delete' => (Gate::allows('delete', AssetModel::class) && ($assetmodel->deleted_at=='')) ? true : false,
+            'delete' => (Gate::allows('delete', AssetModel::class) && ($assetmodel->assets_count==0) && ($assetmodel->deleted_at=='')) ? true : false,
             'clone' => (Gate::allows('create', AssetModel::class) && ($assetmodel->deleted_at=='')) ,
             'restore' => (Gate::allows('create', AssetModel::class) && ($assetmodel->deleted_at!='')) ? true : false,
         ];

From 856a760d89828fdef8fb821f9c145869d8ae6b45 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 12 Dec 2017 06:52:50 -0800
Subject: [PATCH 09/13] Improved - disallow deleting manufactureres if there
 are associated items

This is enforced on the backend - UI imorovement only
---
 app/Http/Transformers/ManufacturersTransformer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Transformers/ManufacturersTransformer.php b/app/Http/Transformers/ManufacturersTransformer.php
index 7ef0ea54a6..6972d0bbc4 100644
--- a/app/Http/Transformers/ManufacturersTransformer.php
+++ b/app/Http/Transformers/ManufacturersTransformer.php
@@ -40,7 +40,7 @@ class ManufacturersTransformer
 
             $permissions_array['available_actions'] = [
                 'update' => Gate::allows('update', Manufacturer::class) ? true : false,
-                'delete' => Gate::allows('delete', Manufacturer::class) ? true : false,
+                'delete' => (Gate::allows('delete', Manufacturer::class) && ($manufacturer->assets_count == 0)  && ($manufacturer->licenses_count==0)  && ($manufacturer->consumables_count==0)  && ($manufacturer->accessories_count==0)  && ($manufacturer->deleted_at=='')) ? true : false,
             ];
 
             $array += $permissions_array;

From 528630a8d3f9ea409b2974c77bcd4886198639e5 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 12 Dec 2017 07:03:09 -0800
Subject: [PATCH 10/13] Improvement - make asset, etc totals in company listing
 sortable

---
 app/Http/Transformers/CompaniesTransformer.php |  2 +-
 app/Presenters/CompanyPresenter.php            | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Http/Transformers/CompaniesTransformer.php b/app/Http/Transformers/CompaniesTransformer.php
index d8f89ea3b0..e4e8a48711 100644
--- a/app/Http/Transformers/CompaniesTransformer.php
+++ b/app/Http/Transformers/CompaniesTransformer.php
@@ -38,7 +38,7 @@ class CompaniesTransformer
 
             $permissions_array['available_actions'] = [
                 'update' => Gate::allows('update', Company::class) ? true : false,
-                'delete' => Gate::allows('delete', Company::class) ? true : false,
+                'delete' => (Gate::allows('delete', Category::class) && ($company->assets_count == 0) && ($company->accessories_count == 0) && ($company->consumables_count == 0) && ($company->components_count == 0) && ($company->users_count == 0)) ? true : false,
             ];
 
             $array += $permissions_array;
diff --git a/app/Presenters/CompanyPresenter.php b/app/Presenters/CompanyPresenter.php
index 233245ff7d..1d0ab86b4a 100644
--- a/app/Presenters/CompanyPresenter.php
+++ b/app/Presenters/CompanyPresenter.php
@@ -41,51 +41,51 @@ class CompanyPresenter extends Presenter
             ],[
                 "field" => "users_count",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "title" => '<span class="hidden-xs"><i class="fa fa-users"></i></span><span class="hidden-md hidden-lg">'.trans('general.users').'</span></th>',
                 "visible" => true,
  
             ],[
                 "field" => "assets_count",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "title" => '<span class="hidden-xs"><i class="fa fa-barcode"></i></span><span class="hidden-md hidden-lg">'.trans('general.assets').'</span>',
                 "visible" => true,
 
             ],[
                 "field" => "licenses_count",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "visible" => true,
                 "title" => ' <span class="hidden-xs"><i class="fa fa-floppy-o"></i></span><span class="hidden-md hidden-lg">'.trans('general.licenses').'</span>',
             ],[
                 "field" => "accessories_count",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "visible" => true,
                 "title" => ' <span class="hidden-xs"><i class="fa fa-keyboard-o"></i></span><span class="hidden-md hidden-lg">'.trans('general.accessories').'</span>',
             ],[
                 "field" => "consumables_count",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "visible" => true,
                 "title" => ' <span class="hidden-xs"><i class="fa fa-tint"></i></span><span class="hidden-md hidden-lg">'.trans('general.consumables').'</span>',
             ],[
                 "field" => "components_count",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "visible" => true,
                 "title" => ' <span class="hidden-xs"><i class="fa fa-hdd-o"></i></span><span class="hidden-md hidden-lg">'.trans('general.components').'</span>',
             ],[
                 "field" => "updated_at",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "visible" => false,
                 "title" => trans('general.updated_at'),
             ],[
                 "field" => "created_at",
                 "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                 "visible" => false,
                 "title" => trans('general.created_at'),
             ],[

From 1ef44721f59ab2ce5e241daea07fa276d5c6b5ba Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 12 Dec 2017 07:03:31 -0800
Subject: [PATCH 11/13] Improved - disallow delete if not elgible in UI

---
 app/Http/Controllers/Api/CompaniesController.php | 15 +++++++++++++--
 app/Http/Transformers/DepartmentsTranformer.php  |  2 +-
 app/Http/Transformers/LocationsTransformer.php   |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Api/CompaniesController.php b/app/Http/Controllers/Api/CompaniesController.php
index 4d5a1b2a4f..ebafd9a98e 100644
--- a/app/Http/Controllers/Api/CompaniesController.php
+++ b/app/Http/Controllers/Api/CompaniesController.php
@@ -22,10 +22,21 @@ class CompaniesController extends Controller
     {
         $this->authorize('view', Company::class);
 
-        $allowed_columns = ['id','name'];
+        $allowed_columns = [
+            'id',
+            'name',
+            'created_at',
+            'updated_at',
+            'users_count',
+            'assets_count',
+            'licenses_count',
+            'accessories_count',
+            'consumables_count',
+            'components_count',
+        ];
 
         $companies = Company::withCount('assets','licenses','accessories','consumables','components','users')
-            ->withCount('users')->withCount('users')->withCount('assets')
+            ->withCount('users')->withCount('assets')
             ->withCount('licenses')->withCount('accessories')
             ->withCount('consumables')->withCount('components');
 
diff --git a/app/Http/Transformers/DepartmentsTranformer.php b/app/Http/Transformers/DepartmentsTranformer.php
index dd51e73aa8..f81954f947 100644
--- a/app/Http/Transformers/DepartmentsTranformer.php
+++ b/app/Http/Transformers/DepartmentsTranformer.php
@@ -47,7 +47,7 @@ class DepartmentsTransformer
 
             $permissions_array['available_actions'] = [
                 'update' => Gate::allows('update', Department::class) ? true : false,
-                'delete' => Gate::allows('delete', Department::class) ? true : false,
+                'delete' => (Gate::allows('delete', Department::class) && ($department->users_count==0) && ($department->deleted_at=='')) ? true : false,
             ];
 
             $array += $permissions_array;
diff --git a/app/Http/Transformers/LocationsTransformer.php b/app/Http/Transformers/LocationsTransformer.php
index 96fd25fee6..f8aa322c30 100644
--- a/app/Http/Transformers/LocationsTransformer.php
+++ b/app/Http/Transformers/LocationsTransformer.php
@@ -57,7 +57,7 @@ class LocationsTransformer
 
             $permissions_array['available_actions'] = [
                 'update' => Gate::allows('update', Location::class) ? true : false,
-                'delete' => Gate::allows('delete', Location::class) ? true : false,
+                'delete' => (Gate::allows('delete', Department::class) && ($location->assigned_assets_count==0) && ($location->assets_count==0) && ($location->users_count==0) && ($location->deleted_at=='')) ? true : false,
             ];
 
             $array += $permissions_array;

From e21fa372541638dc3e48b3d6fad19285ddfaa1da Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 12 Dec 2017 07:15:51 -0800
Subject: [PATCH 12/13] Added - bulk actions to model asset listings

---
 resources/views/models/view.blade.php | 63 ++++++++++++++++++---------
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index 383e1d9cab..a107ed8c1a 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -42,27 +42,48 @@
         </div><!-- /.box-header -->
       @endif
       <div class="box-body">
-        <table
-        name="modelassets"
-        id="table"
-        class="snipe-table"
-        data-url="{{ route('api.assets.index',['model_id'=> $model->id]) }}"
-        data-cookie="true"
-        data-click-to-select="true"
-        data-cookie-id-table="modeldetailsViewTable">
-          <thead>
-              <tr>
-                  <th data-sortable="true" data-field="id" data-searchable="false" data-visible="false">{{ trans('general.id') }}</th>
-                  <th data-sortable="false" data-field="company" data-searchable="false" data-visible="false" data-formatter="companiesLinkObjFormatter">{{ trans('admin/companies/table.title') }}</th>
-                  <th data-sortable="true" data-field="name"  data-searchable="true" data-formatter="hardwareLinkFormatter">{{ trans('general.name') }}</th>
-                  <th data-sortable="true" data-field="asset_tag" data-formatter="hardwareLinkFormatter">{{ trans('general.asset_tag') }}</th>
-                  <th data-sortable="true" data-field="serial" data-formatter="hardwareLinkFormatter">{{ trans('admin/hardware/table.serial') }}</th>
-                  <th data-sortable="false" data-field="assigned_to" data-formatter="polymorphicItemFormatter">{{ trans('general.user') }}</th>
-                  <th data-sortable="false" data-field="inout" data-formatter="hardwareInOutFormatter">{{ trans('admin/hardware/table.change') }}</th>
-                  <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions" data-formatter="hardwareActionsFormatter">{{ trans('table.actions') }}</th>
-              </tr>
-          </thead>
-        </table>
+          <div class="row">
+              <div class="col-md-12">
+                  {{ Form::open([
+                     'method' => 'POST',
+                     'route' => ['hardware/bulkedit'],
+                     'class' => 'form-inline',
+                      'id' => 'bulkForm']) }}
+                  <div id="toolbar">
+                      <select name="bulk_actions" class="form-control select2">
+                          <option value="edit">Edit</option>
+                          <option value="delete">Delete</option>
+                          <option value="labels">Generate Labels</option>
+                      </select>
+                      <button class="btn btn-primary" id="bulkEdit" disabled>Go</button>
+                  </div>
+
+                <table
+                name="modelassets"
+                id="table"
+                class="snipe-table"
+                data-toolbar="#toolbar"
+                data-url="{{ route('api.assets.index',['model_id'=> $model->id]) }}"
+                data-cookie="true"
+                data-click-to-select="true"
+                data-cookie-id-table="model-assets">
+                  <thead>
+                      <tr>
+                          <th data-checkbox="true" data-field="checkbox"></th>
+                          <th data-sortable="true" data-field="id" data-searchable="false" data-visible="false">{{ trans('general.id') }}</th>
+                          <th data-sortable="false" data-field="company" data-searchable="false" data-visible="false" data-formatter="companiesLinkObjFormatter">{{ trans('admin/companies/table.title') }}</th>
+                          <th data-sortable="true" data-field="name"  data-searchable="true" data-formatter="hardwareLinkFormatter">{{ trans('general.name') }}</th>
+                          <th data-sortable="true" data-field="asset_tag" data-formatter="hardwareLinkFormatter">{{ trans('general.asset_tag') }}</th>
+                          <th data-sortable="true" data-field="serial" data-formatter="hardwareLinkFormatter">{{ trans('admin/hardware/table.serial') }}</th>
+                          <th data-sortable="false" data-field="assigned_to" data-formatter="polymorphicItemFormatter">{{ trans('general.user') }}</th>
+                          <th data-sortable="false" data-field="inout" data-formatter="hardwareInOutFormatter">{{ trans('admin/hardware/table.change') }}</th>
+                          <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions" data-formatter="hardwareActionsFormatter">{{ trans('table.actions') }}</th>
+                      </tr>
+                  </thead>
+                </table>
+                  {{ Form::close() }}
+              </div>
+          </div>
       </div> <!-- /.box-body-->
     </div> <!-- /.box-default-->
   </div> <!-- /.col-md-9-->

From 1d82f80e735d57a6c3f1a8ace53c069e929c8115 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 12 Dec 2017 07:20:06 -0800
Subject: [PATCH 13/13] =?UTF-8?q?Improved=20-=20used=20=E2=80=9Cchecked=20?=
 =?UTF-8?q?out=20to=E2=80=9D=20string=20in=20asset=20model=20listing=20to?=
 =?UTF-8?q?=20reflect=20new=20polymorphic=20options?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/models/view.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index a107ed8c1a..3b5b8d7f9e 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -75,7 +75,7 @@
                           <th data-sortable="true" data-field="name"  data-searchable="true" data-formatter="hardwareLinkFormatter">{{ trans('general.name') }}</th>
                           <th data-sortable="true" data-field="asset_tag" data-formatter="hardwareLinkFormatter">{{ trans('general.asset_tag') }}</th>
                           <th data-sortable="true" data-field="serial" data-formatter="hardwareLinkFormatter">{{ trans('admin/hardware/table.serial') }}</th>
-                          <th data-sortable="false" data-field="assigned_to" data-formatter="polymorphicItemFormatter">{{ trans('general.user') }}</th>
+                          <th data-sortable="false" data-field="assigned_to" data-formatter="polymorphicItemFormatter">{{ trans('admin/hardware/form.checkedout_to') }}</th>
                           <th data-sortable="false" data-field="inout" data-formatter="hardwareInOutFormatter">{{ trans('admin/hardware/table.change') }}</th>
                           <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions" data-formatter="hardwareActionsFormatter">{{ trans('table.actions') }}</th>
                       </tr>