diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php
index adcbfafe9a..ea42b51d76 100644
--- a/app/Http/Transformers/AssetsTransformer.php
+++ b/app/Http/Transformers/AssetsTransformer.php
@@ -34,7 +34,7 @@ class AssetsTransformer
'status_label' => ($asset->assetstatus) ? [
'id' => (int) $asset->assetstatus->id,
'name'=> e($asset->assetstatus->name),
- 'status_type' => e($asset->assetstatus->getStatuslabelType()),
+ 'status_meta' => e($asset->present()->statusMeta),
] : null,
'category' => ($asset->model->category) ? [
'id' => (int) $asset->model->category->id,
diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
index 87d4469b50..814a5c5737 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -325,13 +325,32 @@ class AssetPresenter extends Presenter
return $interval;
}
+ /**
+ * @return string
+ * This handles the status label "meta" status of "deployed" if
+ * it's assigned. Should maybe deprecate.
+ */
+ public function statusMeta()
+ {
+ if ($this->model->assignedTo) {
+ return strtolower(trans('general.deployed'));
+ }
+ return $this->model->assetstatus->getStatuslabelType();
+ }
+
+ /**
+ * @return string
+ * This handles the status label "meta" status of "deployed" if
+ * it's assigned. Should maybe deprecate.
+ */
public function statusText()
{
if ($this->model->assignedTo) {
- return trans('general.deployed');
+ return strtolower(trans('general.deployed'));
}
return $this->model->assetstatus->name;
}
+
/**
* Date the warantee expires.
* @return false|string
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index fcf22ee6d3..45f5beec95 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -87,8 +87,8 @@
@endif
- {{ $asset->present()->statusText() }}
-
+ {{ $asset->assetstatus->name }}
+
@endif
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index effa640383..46071360ab 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -139,8 +139,8 @@ $('.snipe-table').bootstrapTable({
// Use this when we're introspecting into a column object and need to link
function genericColumnObjLinkFormatter(destination) {
return function (value,row) {
- if ((value) && (value.status_type)) {
- return ' ' + value.name + ' ' + '';
+ if ((value) && (value.status_meta)) {
+ return ' ' + value.name + ' ';
} else if ((value) && (value.name)) {
return ' ' + value.name + '';
}