Skip to content

Commit 14ba5a3

Browse files
committed
Fixes #1310 - adds version hash to table name to prevent cookie issues for folks who pull from dev
1 parent bc8c8e4 commit 14ba5a3

File tree

13 files changed

+24
-53
lines changed

13 files changed

+24
-53
lines changed

app/config/version.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
22
return array (
3-
'app_version' => 'v2.0-391',
4-
'hash_version' => 'v2.0-391-g7e2b418',
3+
'app_version' => 'v2.0-392',
4+
'hash_version' => 'v2.0-392-gdc64ad5',
55
);

app/views/backend/asset_maintenances/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
data-url="{{route('api.asset_maintenances.list')}}"
2727
data-cookie="true"
2828
data-click-to-select="true"
29-
data-cookie-id-table="maintenancesTable">
29+
data-cookie-id-table="maintenancesTable-v{{ Config::get('version.app_version') }}">
3030
<thead>
3131
<tr>
3232
<th data-sortable="true" data-field="id" data-visible="false">@lang('general.id')</th>

app/views/backend/categories/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
data-url="{{route('api.categories.list')}}"
2626
data-cookie="true"
2727
data-click-to-select="true"
28-
data-cookie-id-table="categoriesTable">
28+
data-cookie-id-table="categoriesTable-v{{ Config::get('version.app_version') }}">
2929
<thead>
3030
<tr>
3131
<th data-sortable="true" data-field="id" data-visible="false">@lang('general.id')</th>

app/views/backend/consumables/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
data-url="{{route('api.consumables.list')}}"
2626
data-cookie="true"
2727
data-click-to-select="true"
28-
data-cookie-id-table="consumablesTable">
28+
data-cookie-id-table="consumablesTable-v{{ Config::get('version.app_version') }}">
2929
<thead>
3030
<tr>
3131
<th data-sortable="true" data-field="id" data-visible="false">@lang('general.id')</th>

app/views/backend/depreciations/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
id="table"
2626
data-url="{{ route('api.depreciations.list') }}"
2727
data-cookie="true"
28-
data-cookie-id-table="depreciationsTable">
28+
data-cookie-id-table="depreciationsTable-v{{ Config::get('version.app_version') }}">
2929
<thead>
3030
<tr>
3131
<th data-sortable="true" data-field="id" data-visible="false">@lang('general.id')</th>

app/views/backend/hardware/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
data-url="{{route('api.hardware.list', array(''=>Input::get('status'),'order_number'=>Input::get('order_number')))}}"
6262
data-cookie="true"
6363
data-click-to-select="true"
64-
data-cookie-id-table="assetTable">
64+
data-cookie-id-table="assetTable-v{{ Config::get('version.app_version') }}">
6565
<thead>
6666
<tr>
6767

app/views/backend/locations/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
data-url="{{ route('api.locations.list') }}"
2525
data-cookie="true"
2626
data-click-to-select="true"
27-
data-cookie-id-table="locationsTable">
27+
data-cookie-id-table="locationsTable-v{{ Config::get('version.app_version') }}">
2828
<thead>
2929
<tr>
3030
<th data-sortable="true" data-field="id" data-visible="false">@lang('general.id')</th>

app/views/backend/manufacturers/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
data-url="{{route('api.manufacturers.list')}}"
3030
data-cookie="true"
3131
data-click-to-select="true"
32-
data-cookie-id-table="manufacturersTable">
32+
data-cookie-id-table="manufacturersTable-v{{ Config::get('version.app_version') }}">
3333
<thead>
3434
<tr>
3535
<th data-sortable="true" data-field="id" data-visible="false">@lang('general.id')</th>

app/views/backend/models/index.blade.php

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,22 @@
2323

2424
<div class="row form-wrapper">
2525

26-
<table name="models" id="table" data-url="{{route('api.models.list', Input::get('status'))}}">
26+
<table
27+
name="models"
28+
id="table"
29+
data-url="{{route('api.models.list')}}"
30+
data-cookie="true"
31+
data-click-to-select="true"
32+
data-cookie-id-table="modelsTable-v{{ Config::get('version.app_version') }}">
2733
<thead>
2834
<tr>
29-
<th data-sortable="true" data-field="manufacturer">{{Lang::get('general.manufacturer')}}</th>
35+
<th data-sortable="true" data-field="id" data-visible="false">{{Lang::get('general.id')}}</th>
36+
<th data-sortable="false" data-field="manufacturer">{{Lang::get('general.manufacturer')}}</th>
3037
<th data-sortable="true" data-field="name">{{Lang::get('admin/models/table.title')}}</th>
3138
<th data-sortable="true" data-field="modelnumber">{{Lang::get('admin/models/table.modelnumber')}}</th>
32-
<th data-sortable="true" data-field="numassets">{{Lang::get('admin/models/table.numassets')}}</th>
33-
<th data-sortable="true" data-field="depreciation">{{Lang::get('general.depreciation')}}</th>
34-
<th data-sortable="true" data-field="category">{{Lang::get('general.category')}}</th>
39+
<th data-sortable="false" data-field="numassets">{{Lang::get('admin/models/table.numassets')}}</th>
40+
<th data-sortable="false" data-field="depreciation">{{Lang::get('general.depreciation')}}</th>
41+
<th data-sortable="false" data-field="category">{{Lang::get('general.category')}}</th>
3542
<th data-sortable="true" data-field="eol">{{Lang::get('general.eol')}}</th>
3643
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ Lang::get('table.actions') }}</th>
3744
</tr>

app/views/backend/statuslabels/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
data-url="{{ route('api.statuslabels.list') }}"
2828
data-cookie="true"
2929
data-click-to-select="true"
30-
data-cookie-id-table="statuslabelsTable">
30+
data-cookie-id-table="statuslabelsTable-v{{ Config::get('version.app_version') }}">
3131
<thead>
3232
<tr>
3333
<th data-sortable="true" data-field="id" data-visible="false">@lang('general.id')</th>

0 commit comments

Comments
 (0)