From 2a4fef6a61ae7e0794934d7843ed4ecc808829ee Mon Sep 17 00:00:00 2001
From: Sam <1631095+takuy@users.noreply.github.com>
Date: Wed, 18 Jul 2018 22:55:13 -0400
Subject: [PATCH] adds select-id as an option for the asset-select partial.
 allows you to manually override the ID of an element. currently, the
 bulk-checkout partial has two asset-selects, with conflicting IDs. attempts
 to resolve #5882 (#5883)

---
 resources/views/hardware/bulk-checkout.blade.php           | 1 +
 resources/views/partials/forms/edit/asset-select.blade.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/hardware/bulk-checkout.blade.php b/resources/views/hardware/bulk-checkout.blade.php
index c64999833a..dc43b91d2a 100644
--- a/resources/views/hardware/bulk-checkout.blade.php
+++ b/resources/views/hardware/bulk-checkout.blade.php
@@ -73,6 +73,7 @@
             'fieldname' => 'selected_assets[]',
             'multiple' => true,
             'asset_status_type' => 'RTD',
+            'select_id' => 'assigned_assets_select',
           ])
 
 
diff --git a/resources/views/partials/forms/edit/asset-select.blade.php b/resources/views/partials/forms/edit/asset-select.blade.php
index bcd074f333..618dcc6a53 100644
--- a/resources/views/partials/forms/edit/asset-select.blade.php
+++ b/resources/views/partials/forms/edit/asset-select.blade.php
@@ -2,7 +2,7 @@
 <div id="assigned_asset" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
     <div class="col-md-7{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}">
-        <select class="js-data-ajax select2" data-endpoint="hardware" data-placeholder="{{ trans('general.select_asset') }}" name="{{ $fieldname }}" style="width: 100%" id="assigned_asset_select"{{ (isset($multiple)) ? ' multiple' : '' }}{!! (!empty($asset_status_type)) ? ' data-asset-status-type="' . $asset_status_type . '"' : '' !!}>
+        <select class="js-data-ajax select2" data-endpoint="hardware" data-placeholder="{{ trans('general.select_asset') }}" name="{{ $fieldname }}" style="width: 100%" id="{{ (isset($select_id)) ? $select_id : 'assigned_asset_select' }}"{{ (isset($multiple)) ? ' multiple' : '' }}{!! (!empty($asset_status_type)) ? ' data-asset-status-type="' . $asset_status_type . '"' : '' !!}>
 
             @if ((!isset($unselect)) && ($asset_id = Input::old($fieldname, (isset($asset) ? $asset->id  : (isset($item) ? $item->{$fieldname} : '')))))
                 <option value="{{ $asset_id }}" selected="selected">