DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 06:17:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Switch companyName to company

Browse source
This commit is contained in:
snipe 2017-01-26 21:05:33 -08:00
parent 99d837fa50
commit a80af854ba
11 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/AccessoriesController.php
View file

@ -384,7 +384,7 @@ class AccessoriesController extends Controller
* {
* "actions": "(links to available actions)",
* "category": "(link to category)",
* "companyName": "My Company",
* "company": "My Company",
* "location": "My Location",
* "min_amt": 2,
* "name": "(link to accessory),
@ -419,7 +419,7 @@ class AccessoriesController extends Controller
$offset = request('offset', 0);
$limit = request('limit', 50);
$allowed_columns = ['name','min_amt','order_number','purchase_date','purchase_cost','companyName','category','model_number', 'manufacturer', 'location'];
$allowed_columns = ['name','min_amt','order_number','purchase_date','purchase_cost','company','category','model_number', 'manufacturer', 'location'];
$order = Input::get('order') === 'asc' ? 'asc' : 'desc';
$sort = in_array(Input::get('sort'), $allowed_columns) ? e(Input::get('sort')) : 'created_at';
@ -427,7 +427,7 @@ class AccessoriesController extends Controller
case 'category':
$accessories = $accessories->OrderCategory($order);
break;
case 'companyName':
case 'company':
$accessories = $accessories->OrderCompany($order);
break;
case 'location':

2
app/Http/Controllers/Api/AccessoriesController.php
View file

@ -38,7 +38,7 @@ class AccessoriesController extends Controller
case 'category':
$accessories = $accessories->OrderCategory($order);
break;
case 'companyName':
case 'company':
$accessories = $accessories->OrderCompany($order);
break;
default:

2
app/Http/Controllers/AssetMaintenancesController.php
View file

@ -134,7 +134,7 @@ class AssetMaintenancesController extends Controller
'completion_date' => $maintenance->completion_date,
'user_id' => ($maintenance->admin) ? (string)link_to_route('users.show', $maintenance->admin->present()->fullName(), ['user'=>$maintenance->admin->id]) : '',
'actions' => $actions,
'companyName' => ($maintenance->asset->company) ? $maintenance->asset->company->name : ''
'company' => ($maintenance->asset->company) ? $maintenance->asset->company->name : ''
);
}

2
app/Http/Transformers/LicensesTransformer.php
View file

@ -22,7 +22,7 @@ class LicensesTransformer
$array = [
'id' => $license->id,
'name' => e($license->name),
'companyName' => e($license->companyName),
'company' => e($license->company->name),
'manufacturer' => ($license->manufacturer) ? $license->manufacturer : null,
'serial' => e($license->name),
'purchase_order' => e($license->order_number),

2
resources/views/asset_maintenances/index.blade.php
View file

@ -31,7 +31,7 @@
>
<thead>
<tr>
<th data-field="companyName" data-sortable="false" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
<th data-field="company" data-sortable="false" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
<th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
<th data-sortable="false" data-field="asset_name">{{ trans('admin/asset_maintenances/table.asset_name') }}</th>
<th data-sortable="false" data-field="supplier">{{ trans('general.supplier') }}</th>

2
resources/views/categories/view.blade.php
View file

@ -37,7 +37,7 @@
>
<thead>
<tr>
<th data-searchable="false" data-sortable="false" data-field="companyName" data-visible="false">
<th data-searchable="false" data-sortable="false" data-field="company" data-visible="false">
{{ trans('admin/companies/table.title') }}
</th>
<th data-searchable="false" data-sortable="false" data-field="id" data-visible="false">{{ trans('general.id') }}</th>

2
resources/views/licenses/index.blade.php
View file

@ -35,7 +35,7 @@
<tr>
<th data-checkbox="true" data-field="checkbox"></th>
<th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
<th data-field="companyName" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false" data-formatter="companiesLinkObjFormatter">{{ trans('general.company') }}</th>
<th data-field="company" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false" data-formatter="companiesLinkObjFormatter">{{ trans('general.company') }}</th>
<th data-sortable="true" data-field="name" data-visible="false" data-formatter="licensesLinkFormatter">{{ trans('admin/licenses/table.title') }}</th>
<th data-field="manufacturer" data-sortable="true" data-formatter="manufacturersLinkObjFormatter">{{ trans('general.manufacturer') }}</th>
<th data-field="serial" data-sortable="true" >{{ trans('admin/licenses/form.license_key') }}</th>

8
resources/views/manufacturers/view.blade.php
View file

@ -55,7 +55,7 @@
>
<thead>
<tr>
<th data-searchable="false" data-sortable="false" data-field="companyName" data-visible="false">
<th data-searchable="false" data-sortable="false" data-field="company" data-visible="false">
{{ trans('admin/companies/table.title') }}
</th>
<th data-searchable="false" data-sortable="false" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
@ -84,7 +84,7 @@
<thead>
<tr>
<th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
<th data-field="companyName" data-sortable="false" data-switchable="true">{{ trans('general.company') }}</th>
<th data-field="company" data-sortable="false" data-switchable="true">{{ trans('general.company') }}</th>
<th data-field="name" data-sortable="true">{{ trans('admin/licenses/table.title') }}</th>
<th data-field="manufacturer" data-sortable="true">{{ trans('general.manufacturer') }}</th>
<th data-field="serial" data-sortable="true" >{{ trans('admin/licenses/table.serial') }}</th>
@ -115,7 +115,7 @@
>
<thead>
<tr>
<th data-switchable="true" data-searchable="true" data-sortable="true" data-field="companyName" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
<th data-switchable="true" data-searchable="true" data-sortable="true" data-field="company" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
<th data-sortable="true" data-searchable="true" data-field="name">{{ trans('admin/accessories/table.title') }}</th>
<th data-searchable="true" data-sortable="true" data-field="category">{{ trans('admin/accessories/general.accessory_category') }}</th>
<th data-field="manufacturer" data-searchable="true" data-sortable="true">{{ trans('general.manufacturer') }}</th>
@ -145,7 +145,7 @@
<thead>
<tr>
<th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
<th data-switchable="true" data-searchable="true" data-sortable="true" data-field="companyName">{{ trans('admin/companies/table.title') }}</th>
<th data-switchable="true" data-searchable="true" data-sortable="true" data-field="company">{{ trans('admin/companies/table.title') }}</th>
<th data-sortable="true" data-searchable="true" data-field="name">{{ trans('admin/consumables/table.title') }}</th>
<th data-searchable="true" data-sortable="true" data-field="location">{{ trans('general.location') }}</th>
<th data-searchable="true" data-sortable="true" data-field="category">{{ trans('general.category') }}</th>

2
resources/views/reports/asset.blade.php
View file

@ -35,7 +35,7 @@
<th data-class="hidden-xs" 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;"></div></th>
@endif
<th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
<th data-field="companyName" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false">{{ trans('general.company') }}</th>
<th data-field="company" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false">{{ trans('general.company') }}</th>
<th data-sortable="true" data-field="name" data-visible="false">{{ trans('admin/hardware/form.name') }}</th>
<th data-sortable="true" data-field="asset_tag">{{ trans('admin/hardware/table.asset_tag') }}</th>
<th data-sortable="true" data-field="serial">{{ trans('admin/hardware/table.serial') }}</th>

2
resources/views/statuslabels/view.blade.php
View file

@ -50,7 +50,7 @@
<th data-checkbox="true" data-field="checkbox"></th>
@endif
<th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
<th data-field="companyName" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false">{{ trans('general.company') }}</th>
<th data-field="company" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false">{{ trans('general.company') }}</th>
<th data-sortable="true" data-field="image" data-visible="false">{{ trans('admin/hardware/table.image') }}</th>
<th data-sortable="true" data-field="name" data-visible="false">{{ trans('admin/hardware/form.name') }}</th>
<th data-sortable="true" data-field="asset_tag" data-formatter="assetLinkFormatter">{{ trans('admin/hardware/table.asset_tag') }}</th>

2
resources/views/users/index.blade.php
View file

@ -73,7 +73,7 @@
<th data-checkbox="true" data-field="checkbox"></th>
@endif
<th data-switchable="true" data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
<th data-switchable="true" data-sortable="false" data-field="companyName" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
<th data-switchable="true" data-sortable="false" data-field="company" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
<th data-switchable="true" data-sortable="true" data-field="employee_num" data-visible="false">{{ trans('admin/users/table.employee_num') }}</th>
<th data-sortable="true" data-field="name" data-formatter="usersLinkFormatter">{{ trans('admin/users/table.name') }}</th>
<th data-switchable="true" data-sortable="true" data-field="jobtitle" data-visible="false">{{ trans('admin/users/table.title') }}</th>