diff --git a/app/Presenters/ManufacturerPresenter.php b/app/Presenters/ManufacturerPresenter.php
index ecd9d2e250..85a72c1250 100644
--- a/app/Presenters/ManufacturerPresenter.php
+++ b/app/Presenters/ManufacturerPresenter.php
@@ -69,7 +69,8 @@ class ManufacturerPresenter extends Presenter
"sortable" => true,
"switchable" => true,
"title" => trans('admin/manufacturers/table.support_phone'),
- "visible" => true
+ "visible" => true,
+ "formatter" => "phoneFormatter"
],
[
diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index 3cee47cf29..0d49852263 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -85,6 +85,7 @@ class UserPresenter extends Presenter
"switchable" => true,
"title" => trans('admin/users/table.phone'),
"visible" => true,
+ "formatter" => "phoneFormatter",
],
[
"field" => "address",
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 9e3797f288..f390288587 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -170,7 +170,9 @@
@endif
@if ($asset->model->manufacturer->support_phone)
-
{{ $asset->model->manufacturer->support_phone }}
+
+ {{ $asset->model->manufacturer->support_phone }}
+
@endif
@if ($asset->model->manufacturer->support_email)
@@ -467,8 +469,11 @@
{{ $asset->assignedTo->email }}
@endif
- @if ((isset($asset->assignedTo->phone)) && ($asset->assignedTo->phone!=''))
- {{ $asset->assignedTo->phone }}
+ @if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!=''))
+
+
+ {{ $asset->assignedTo->phone }}
+
@endif
@if (isset($asset->location))
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index cf025732ee..66e9053a3c 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -118,7 +118,9 @@
@if ($model->manufacturer->support_phone)
- {{ $model->manufacturer->support_phone }}
+
+ {{ $model->manufacturer->support_phone }}
+
@endif
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 300f21c308..c8b4c013e8 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -425,6 +425,14 @@
}
+ // Create a linked phone number in the table list
+ function phoneFormatter(value) {
+ if (value) {
+ return '' + value + '';
+ }
+ }
+
+
function deployedLocationFormatter(row, value) {
if ((row) && (row!=undefined)) {
return ' ' + row.name + '';
diff --git a/resources/views/suppliers/index.blade.php b/resources/views/suppliers/index.blade.php
index 276a91f023..125b463fda 100755
--- a/resources/views/suppliers/index.blade.php
+++ b/resources/views/suppliers/index.blade.php
@@ -35,7 +35,7 @@
{{ trans('admin/suppliers/table.address') }} |
{{ trans('admin/suppliers/table.contact') }} |
{{ trans('admin/suppliers/table.email') }} |
- {{ trans('admin/suppliers/table.phone') }} |
+ {{ trans('admin/suppliers/table.phone') }} |
{{ trans('admin/suppliers/table.fax') }} |
{{ trans('admin/suppliers/table.assets') }} |
{{ trans('general.accessories') }} |
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index 6d414fbc17..f81e4f144a 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -222,7 +222,9 @@
{{ $supplier->contact }}
@endif
@if ($supplier->phone)
- {{ $supplier->phone }}
+
+ {{ $supplier->phone }}
+
@endif
@if ($supplier->fax)
{{ $supplier->fax }}
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 063b20cbff..1996d96c75 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -196,7 +196,7 @@
@if ($user->phone)
{{ trans('admin/users/table.phone') }} |
- {{ $user->phone }} |
+ {{ $user->phone }} |
@endif