diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index 5217ac1fed..99468dcb3e 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -1709,10 +1709,10 @@ class AssetsController extends Controller
$rows = array();
foreach ($assets as $asset) {
$inout = '';
- $actions = '
';
+ $actions = '
';
if ($asset->deleted_at=='') {
if (Gate::allows('assets.create')) {
- $actions = '
id) . '" class="btn btn-info btn-sm" title="Clone asset" data-toggle="tooltip"> ';
}
if (Gate::allows('assets.edit')) {
@@ -1724,9 +1724,9 @@ class AssetsController extends Controller
$asset->id) . '" data-content="' . trans('admin/hardware/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($asset->asset_tag) . '?" onClick="return false;">
';
}
} elseif ($asset->model->deleted_at=='') {
- $actions = '
';
+ $actions .= '
';
}
-
+
$actions .= '
';
if (($asset->availableForCheckout()))
@@ -1772,7 +1772,12 @@ class AssetsController extends Controller
'companyName' => is_null($asset->company) ? '' : e($asset->company->name)
);
foreach ($all_custom_fields as $field) {
- $row[$field->db_column_name()] = Helper::parseEscapedMarkedown($asset->{$field->db_column_name()});
+ if (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) {
+ $row[$field->db_column_name()] = '
'.$asset->{$field->db_column_name()}.'';
+ } else {
+ $row[$field->db_column_name()] = e($asset->{$field->db_column_name()});
+ }
+
}
$rows[]=$row;
}
diff --git a/config/version.php b/config/version.php
index e782560102..e38c87042a 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,5 +1,5 @@
'v3.3.0',
- 'hash_version' => 'v3.3.0-3-g7ef4f23',
-);
+ 'hash_version' => 'v3.3.0-beta-12-g4c8c58d',
+);
\ No newline at end of file
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index f4e18f78f5..7cfdab9935 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -123,7 +123,14 @@
| {{ $field->name }} |
- {{ $asset->{$field->db_column_name()} }}
+
+ @if (($field->format=='URL') && ($asset->{$field->db_column_name()}!=''))
+ {{ $asset->{$field->db_column_name()} }}
+ @else
+ {{ $asset->{$field->db_column_name()} }}
+ @endif
+
+
|
@endforeach