Skip to content

Commit 08d05b4

Browse files
snipesnipe
committed
Fixes #158 
1 parent 7742bb3 commit 08d05b4

File tree

7 files changed

+85
-10
lines changed

7 files changed

+85
-10
lines changed

‎app/controllers/admin/SettingsController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public function postEdit()
8383
// Update the asset data
8484
$setting->id = '1';
8585
$setting->site_name = e(Input::get('site_name'));
86+
$setting->display_asset_name = e(Input::get('display_asset_name', '0'));
8687
$setting->per_page = e(Input::get('per_page'));
8788
$setting->qr_code = e(Input::get('qr_code', '0'));
8889
$setting->qr_text = e(Input::get('qr_text'));

‎app/database/migrations/2014_06_19_191508_add_asset_name_to_settings.php‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
3+
use Illuminate\Database\Schema\Blueprint;
4+
use Illuminate\Database\Migrations\Migration;
5+
6+
class AddAssetNameToSettings extends Migration {
7+
8+
/**
9+
* Run the migrations.
10+
*
11+
* @return void
12+
*/
13+
public function up()
14+
{
15+
Schema::table('settings', function($table)
16+
{
17+
$table->integer('display_asset_name')->nullable()->default(NULL);
18+
19+
});
20+
}
21+
22+
/**
23+
* Reverse the migrations.
24+
*
25+
* @return void
26+
*/
27+
public function down()
28+
{
29+
Schema::table('settings', function($table)
30+
{
31+
$table->dropColumn('display_asset_name');
32+
});
33+
}
34+
35+
}

‎app/lang/en/admin/settings/general.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
'setting' => 'Setting',
1111
'title' => 'Settings',
1212
'update' => 'Update Settings',
13-
'value' => 'Value',
13+
'value' => 'Value',
14+
'display_asset_name' => 'Display Asset Name',
1415
);

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@
4444
<tr role="row">
4545
<th class="col-md-1" bSortable="true">@lang('admin/hardware/table.asset_tag')</th>
4646
<th class="col-md-3" bSortable="true">@lang('admin/hardware/table.title')</th>
47+
@if (Setting::getSettings()->display_asset_name)
48+
<th class="col-md-3" bSortable="true">@lang('general.name')</th>
49+
@endif
4750
<th class="col-md-2" bSortable="true">@lang('admin/hardware/table.serial')</th>
4851
@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD'))
4952
<th class="col-md-2" bSortable="true">@lang('general.status')</th>
@@ -62,6 +65,9 @@
6265
<tr>
6366
<td><a href="{{ route('view/hardware', $asset->id) }}">{{ $asset->asset_tag }}</a></td>
6467
<td><a href="{{ route('view/hardware', $asset->id) }}">{{ $asset->model->name }}</a></td>
68+
@if (Setting::getSettings()->display_asset_name)
69+
<td><a href="{{ route('view/hardware', $asset->id) }}">{{ $asset->name }}</a></td>
70+
@endif
6571
<td>{{ $asset->serial }}</td>
6672
@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD'))
6773
<td>

‎app/views/backend/reports/index.blade.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<tr role="row">
2828
<th class="col-sm-1">@lang('admin/hardware/table.asset_tag')</th>
2929
<th class="col-sm-1">@lang('admin/hardware/table.title')</th>
30+
@if (Setting::getSettings()->display_asset_name)
31+
<th class="col-sm-1">@lang('general.name')</th>
32+
@endif
3033
<th class="col-sm-1">@lang('admin/hardware/table.serial')</th>
3134
<th class="col-sm-1">@lang('admin/hardware/table.checkoutto')</th>
3235
<th class="col-sm-1">@lang('admin/hardware/table.location')</th>
@@ -43,6 +46,9 @@
4346
<tr>
4447
<td>{{ $asset->asset_tag }}</td>
4548
<td>{{ $asset->model->name }}</td>
49+
@if (Setting::getSettings()->display_asset_name)
50+
<td>{{ $asset->name }}</td>
51+
@endif
4652
<td>{{ $asset->serial }}</td>
4753
<td>
4854
@if ($asset->assigned_to != 0)

‎app/views/backend/settings/edit.blade.php‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,21 @@
3939
{{ $errors->first('site_name', '<span class="help-inline">:message</span>') }}
4040
</div>
4141
</div>
42+
43+
<div class="form-group {{ $errors->has('display_asset_name') ? 'error' : '' }}">
44+
<label class="control-label" for="display_asset_name">
45+
@lang('admin/settings/general.display_asset_name')
46+
</label>
47+
<div class="controls">
48+
49+
<input class="col-md-1" type="checkbox" name="display_asset_name" id="display_asset_name" value="1" {{ $setting->display_asset_name === '1' ? 'checked' : '' }} />
50+
51+
{{ $errors->first('display_asset_name', '<span class="help-inline">:message</span>') }}
52+
</div>
53+
</div>
54+
55+
56+
4257
<div class="form-group {{ $errors->has('per_page') ? 'error' : '' }}">
4358
<label class="control-label" for="per_page">Results Per Page</label>
4459
<div class="controls">

‎app/views/backend/settings/index.blade.php‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{-- Page title --}}
44
@section('title')
5-
@lang('admin/settings/general.title') ::
5+
Settings ::
66
@parent
77
@stop
88

@@ -16,7 +16,7 @@
1616
</div>
1717

1818

19-
<h3 class="name">@lang('admin/settings/general.title')</h3>
19+
<h3 class="name">Settings</h3>
2020

2121

2222
<div class="row-fluid profile">
@@ -29,30 +29,41 @@
2929
<table class="table table-hover">
3030
<thead>
3131
<tr>
32-
<th class="col-md-3">@lang('admin/settings/general.setting')</th>
33-
<th class="col-md-3"><span class="line"></span>@lang('admin/settings/general.value')</th>
32+
<th class="col-md-3">Setting</th>
33+
<th class="col-md-3"><span class="line"></span>Value</th>
3434
</tr>
3535
</thead>
3636
<tbody>
3737
@foreach ($settings as $setting)
3838
<tr>
39-
<td>@lang('general.site_name')</td>
39+
<td>Site Name</td>
4040
<td>{{ $setting->site_name }} </td>
4141
</tr>
4242
<tr>
43-
<td>@lang('general.per_page')</td>
43+
<td>@lang('admin/settings/general.display_asset_name')</td>
44+
45+
46+
@if ($setting->display_asset_name === '1')
47+
<td>Yes</td>
48+
@else
49+
<td>No</td>
50+
@endif
51+
</tr>
52+
53+
<tr>
54+
<td>Per Page</td>
4455
<td>{{ $setting->per_page }} </td>
4556
</tr>
4657
<tr>
47-
<td>@lang('admin/settings/general.display_qr')</td>
58+
<td>Display QR Codes</td>
4859
@if ($setting->qr_code === '1')
4960
<td>Yes</td>
5061
@else
5162
<td>No</td>
5263
@endif
5364
</tr>
5465
<tr>
55-
<td>@lang('admin/settings/general.qr_text')</td>
66+
<td>QR Code Text</td>
5667
<td>{{ $setting->qr_text }}</td>
5768
</tr>
5869
@endforeach
@@ -66,7 +77,7 @@
6677
<div class="col-md-3 address pull-right">
6778
<br /><br />
6879

69-
<p>@lang('admin/settings/general.info')</p>
80+
<p>These settings let you customize certain aspects of your installation. </p>
7081

7182
</div>
7283
@stop

0 commit comments

Comments
 (0)