From 14ba5a3b77e894ae82c73607f39e30bbce9895af Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 4 Nov 2015 01:08:05 -0800
Subject: [PATCH] Fixes #1310 - adds version hash to table name to prevent
 cookie issues for folks who pull from dev

---
 app/config/version.php                        |  4 +--
 .../asset_maintenances/index.blade.php        |  2 +-
 app/views/backend/categories/index.blade.php  |  2 +-
 app/views/backend/consumables/index.blade.php |  2 +-
 .../backend/depreciations/index.blade.php     |  2 +-
 app/views/backend/hardware/index.blade.php    |  2 +-
 app/views/backend/locations/index.blade.php   |  2 +-
 .../backend/manufacturers/index.blade.php     |  2 +-
 app/views/backend/models/index.blade.php      | 17 ++++++---
 .../backend/statuslabels/index.blade.php      |  2 +-
 app/views/backend/suppliers/index.blade.php   |  2 +-
 app/views/backend/users/datatable.blade.php   | 36 -------------------
 app/views/backend/users/index.blade.php       |  2 +-
 13 files changed, 24 insertions(+), 53 deletions(-)
 delete mode 100644 app/views/backend/users/datatable.blade.php

diff --git a/app/config/version.php b/app/config/version.php
index fa56774236..443ef2f032 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v2.0-391',
-  'hash_version' => 'v2.0-391-g7e2b418',
+  'app_version' => 'v2.0-392',
+  'hash_version' => 'v2.0-392-gdc64ad5',
 );
\ No newline at end of file
diff --git a/app/views/backend/asset_maintenances/index.blade.php b/app/views/backend/asset_maintenances/index.blade.php
index 57601f1491..53caad3bec 100644
--- a/app/views/backend/asset_maintenances/index.blade.php
+++ b/app/views/backend/asset_maintenances/index.blade.php
@@ -26,7 +26,7 @@
          data-url="{{route('api.asset_maintenances.list')}}"
          data-cookie="true"
          data-click-to-select="true"
-         data-cookie-id-table="maintenancesTable">
+         data-cookie-id-table="maintenancesTable-v{{ Config::get('version.app_version') }}">
             <thead>
                      <tr>
                      <th data-sortable="true" data-field="id" data-visible="false">@lang('general.id')</th>
diff --git a/app/views/backend/categories/index.blade.php b/app/views/backend/categories/index.blade.php
index 508ddbd247..9757256735 100755
--- a/app/views/backend/categories/index.blade.php
+++ b/app/views/backend/categories/index.blade.php
@@ -25,7 +25,7 @@
             data-url="{{route('api.categories.list')}}"
             data-cookie="true"
             data-click-to-select="true"
-            data-cookie-id-table="categoriesTable">
+            data-cookie-id-table="categoriesTable-v{{ Config::get('version.app_version') }}">
 		        <thead>
 		            <tr>
                     <th data-sortable="true" data-field="id" data-visible="false">@lang('general.id')</th>
diff --git a/app/views/backend/consumables/index.blade.php b/app/views/backend/consumables/index.blade.php
index fc538f6de1..c7c1d6f017 100644
--- a/app/views/backend/consumables/index.blade.php
+++ b/app/views/backend/consumables/index.blade.php
@@ -25,7 +25,7 @@
             data-url="{{route('api.consumables.list')}}"
             data-cookie="true"
             data-click-to-select="true"
-            data-cookie-id-table="consumablesTable">
+            data-cookie-id-table="consumablesTable-v{{ Config::get('version.app_version') }}">
                 <thead>
                     <tr>
                         <th data-sortable="true" data-field="id" data-visible="false">@lang('general.id')</th>
diff --git a/app/views/backend/depreciations/index.blade.php b/app/views/backend/depreciations/index.blade.php
index def43273f5..d036fa25ba 100755
--- a/app/views/backend/depreciations/index.blade.php
+++ b/app/views/backend/depreciations/index.blade.php
@@ -25,7 +25,7 @@ Asset Depreciations ::
                   id="table"
                   data-url="{{ route('api.depreciations.list') }}"
                   data-cookie="true"
-                  data-cookie-id-table="depreciationsTable">
+                  data-cookie-id-table="depreciationsTable-v{{ Config::get('version.app_version') }}">
                       <thead>
                           <tr>
                               <th data-sortable="true" data-field="id" data-visible="false">@lang('general.id')</th>
diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php
index b55009ab92..128a9bd262 100755
--- a/app/views/backend/hardware/index.blade.php
+++ b/app/views/backend/hardware/index.blade.php
@@ -61,7 +61,7 @@
     data-url="{{route('api.hardware.list', array(''=>Input::get('status'),'order_number'=>Input::get('order_number')))}}"
     data-cookie="true"
     data-click-to-select="true"
-    data-cookie-id-table="assetTable">
+    data-cookie-id-table="assetTable-v{{ Config::get('version.app_version') }}">
         <thead>
             <tr>
 
diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php
index bf23a4e518..f127a13129 100755
--- a/app/views/backend/locations/index.blade.php
+++ b/app/views/backend/locations/index.blade.php
@@ -24,7 +24,7 @@ Locations ::
     data-url="{{ route('api.locations.list') }}"
     data-cookie="true"
     data-click-to-select="true"
-    data-cookie-id-table="locationsTable">
+    data-cookie-id-table="locationsTable-v{{ Config::get('version.app_version') }}">
         <thead>
             <tr>
                 <th data-sortable="true" data-field="id" data-visible="false">@lang('general.id')</th>
diff --git a/app/views/backend/manufacturers/index.blade.php b/app/views/backend/manufacturers/index.blade.php
index 8b345ac2dd..61d26bb783 100755
--- a/app/views/backend/manufacturers/index.blade.php
+++ b/app/views/backend/manufacturers/index.blade.php
@@ -29,7 +29,7 @@
     data-url="{{route('api.manufacturers.list')}}"
     data-cookie="true"
     data-click-to-select="true"
-    data-cookie-id-table="manufacturersTable">
+    data-cookie-id-table="manufacturersTable-v{{ Config::get('version.app_version') }}">
         <thead>
             <tr>
                 <th data-sortable="true" data-field="id" data-visible="false">@lang('general.id')</th>
diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php
index 7ead7cb695..d4d753730a 100755
--- a/app/views/backend/models/index.blade.php
+++ b/app/views/backend/models/index.blade.php
@@ -23,15 +23,22 @@
 
 <div class="row form-wrapper">
 
-    <table name="models" id="table" data-url="{{route('api.models.list', Input::get('status'))}}">
+  <table
+  name="models"
+  id="table"
+  data-url="{{route('api.models.list')}}"
+  data-cookie="true"
+  data-click-to-select="true"
+  data-cookie-id-table="modelsTable-v{{ Config::get('version.app_version') }}">
         <thead>
             <tr>
-                <th data-sortable="true" data-field="manufacturer">{{Lang::get('general.manufacturer')}}</th>
+                <th data-sortable="true" data-field="id" data-visible="false">{{Lang::get('general.id')}}</th>
+                <th data-sortable="false" data-field="manufacturer">{{Lang::get('general.manufacturer')}}</th>
                 <th data-sortable="true" data-field="name">{{Lang::get('admin/models/table.title')}}</th>
                 <th data-sortable="true" data-field="modelnumber">{{Lang::get('admin/models/table.modelnumber')}}</th>
-                <th data-sortable="true" data-field="numassets">{{Lang::get('admin/models/table.numassets')}}</th>
-                <th data-sortable="true" data-field="depreciation">{{Lang::get('general.depreciation')}}</th>
-                <th data-sortable="true" data-field="category">{{Lang::get('general.category')}}</th>
+                <th data-sortable="false" data-field="numassets">{{Lang::get('admin/models/table.numassets')}}</th>
+                <th data-sortable="false" data-field="depreciation">{{Lang::get('general.depreciation')}}</th>
+                <th data-sortable="false" data-field="category">{{Lang::get('general.category')}}</th>
                 <th data-sortable="true" data-field="eol">{{Lang::get('general.eol')}}</th>
                 <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ Lang::get('table.actions') }}</th>
             </tr>
diff --git a/app/views/backend/statuslabels/index.blade.php b/app/views/backend/statuslabels/index.blade.php
index c40df384fb..f648519448 100755
--- a/app/views/backend/statuslabels/index.blade.php
+++ b/app/views/backend/statuslabels/index.blade.php
@@ -27,7 +27,7 @@
       data-url="{{ route('api.statuslabels.list') }}"
       data-cookie="true"
       data-click-to-select="true"
-      data-cookie-id-table="statuslabelsTable">
+      data-cookie-id-table="statuslabelsTable-v{{ Config::get('version.app_version') }}">
           <thead>
               <tr>
                   <th data-sortable="true" data-field="id" data-visible="false">@lang('general.id')</th>
diff --git a/app/views/backend/suppliers/index.blade.php b/app/views/backend/suppliers/index.blade.php
index 519e458a30..c4b406676f 100755
--- a/app/views/backend/suppliers/index.blade.php
+++ b/app/views/backend/suppliers/index.blade.php
@@ -25,7 +25,7 @@
       data-url="{{ route('api.suppliers.list') }}"
       data-cookie="true"
       data-click-to-select="true"
-      data-cookie-id-table="suppliersTable">
+      data-cookie-id-table="suppliersTable-v{{ Config::get('version.app_version') }}">
           <thead>
               <tr>
                   <th data-sortable="true" data-field="id" data-visible="false">@lang('admin/suppliers/table.id')</th>
diff --git a/app/views/backend/users/datatable.blade.php b/app/views/backend/users/datatable.blade.php
deleted file mode 100644
index ceb573e3a5..0000000000
--- a/app/views/backend/users/datatable.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<table id="{{ $id }}" class="{{ $class }}">
-    <colgroup>
-        @for ($i = 0; $i < count($columns); $i++)
-        <col class="con{{ $i }}" />
-        @endfor
-    </colgroup>
-    <thead>
-    <tr>
-        @foreach($columns as $i => $c)
-        <th align="center" valign="middle" class="head{{ $i }}">{{ $c }}</th>
-        @endforeach
-    </tr>
-    </thead>
-    <tfoot>
-    <tr>
-      <td colspan="11">
-	      <select name="bulk_actions">
-              <option value="delete">Bulk Delete</option>
-	      </select>
-	      <button class="btn btn-default" id="bulkEdit" disabled>Go</button></td>
-    </tr>
-  </tfoot>
-    <tbody>
-    @foreach($data as $d)
-    <tr>
-        @foreach($d as $dd)
-        <td>{{ $dd }}</td>
-        @endforeach
-    </tr>
-    @endforeach
-    </tbody>
-</table>
-
-@if (!$noScript)
-    @include(Config::get('datatable::table.script_view'), array('id' => $id, 'options' => $options, 'callbacks' =>  $callbacks))
-@endif
diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php
index 932b1a5475..f207cb40d4 100755
--- a/app/views/backend/users/index.blade.php
+++ b/app/views/backend/users/index.blade.php
@@ -46,7 +46,7 @@
         data-url="{{ route('api.users.list', array(''=>Input::get('status'))) }}"
         data-cookie="true"
         data-click-to-select="true"
-        data-cookie-id-table="userTableDisplay">
+        data-cookie-id-table="userTableDisplay-v{{ Config::get('version.app_version') }}">
            <thead>
                <tr>
                    <th data-class="hidden-xs hidden-sm" data-switchable="false" data-searchable="false" data-sortable="false" data-field="checkbox"><div class="text-center"><input type="checkbox" id="checkAll" style="padding-left: 0px;" style="hidden-xs hidden-sm"></div></th>