Merge remote-tracking branch 'origin/develop'

snipe · snipe · commit daefec301385 · 2025-09-01T20:32:57.000+01:00
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
@@ -338,6 +338,7 @@ function genericColumnObjLinkFormatter(destination) {
                   'deployed': '{{ strtolower(trans('general.deployed')) }}',
                   'deployable': '{{ strtolower(trans('admin/hardware/general.deployable')) }}',
                   'archived': '{{ strtolower(trans('general.archived')) }}',
+                  'undeployable': '{{ strtolower(trans('general.undeployable')) }}',
                   'pending': '{{ strtolower(trans('general.pending')) }}'
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -338,6 +338,7 @@ function genericColumnObjLinkFormatter(destination) {`
`338`	`338`	`'deployed': '{{ strtolower(trans('general.deployed')) }}',`
`339`	`339`	`'deployable': '{{ strtolower(trans('admin/hardware/general.deployable')) }}',`
`340`	`340`	`'archived': '{{ strtolower(trans('general.archived')) }}',`
	`341`	`+ 'undeployable': '{{ strtolower(trans('general.undeployable')) }}',`
`341`	`342`	`'pending': '{{ strtolower(trans('general.pending')) }}'`
`342`	`343`	`}`
`343`	`344`