Merge branch 'develop' of https://github.com/snipe/snipe-it into develop

app/Http/Controllers/Api/LicensesController.php

@@ -76,6 +76,18 @@ class LicensesController extends Controller
             $licenses->where('supplier_id', '=', $request->input('supplier_id'));
         }
 
+        if (($request->filled('maintained')) && ($request->input('maintained')=='true')) {
+            $licenses->where('maintained','=',1);
+        } elseif (($request->filled('maintained')) && ($request->input('maintained')=='false')) {
+            $licenses->where('maintained','=',0);
+        }
+
+        if (($request->filled('expires')) && ($request->input('expires')=='true')) {
+            $licenses->whereNotNull('expiration_date');
+        } elseif (($request->filled('expires')) && ($request->input('expires')=='false')) {
+            $licenses->whereNull('expiration_date');
+        }
+
         if ($request->filled('search')) {
             $licenses = $licenses->TextSearch($request->input('search'));
         }

app/Http/Controllers/Auth/LoginController.php

@@ -154,6 +154,9 @@ class LoginController extends Controller
     {
         $header_name = Setting::getSettings()->login_remote_user_header_name ?: 'REMOTE_USER';
         $remote_user = $request->server($header_name);
+        if (!isset($remote_user)) {
+          $remote_user = $request->server('REDIRECT_'.$header_name);
+        }
         if (Setting::getSettings()->login_remote_user_enabled == '1' && isset($remote_user) && ! empty($remote_user)) {
             Log::debug("Authenticating via HTTP header $header_name.");
 

app/Http/Controllers/BulkAssetModelsController.php

@@ -80,6 +80,11 @@ class BulkAssetModelsController extends Controller
             $update_array['depreciation_id'] = $request->input('depreciation_id');
         }
 
+        if ($request->filled('requestable') != '') {
+            $update_array['requestable'] = $request->input('requestable');
+        }
+
+
         if (count($update_array) > 0) {
             AssetModel::whereIn('id', $models_raw_array)->update($update_array);
 

app/Http/Controllers/CheckInOutRequest.php

@@ -39,6 +39,8 @@ trait CheckInOutRequest
         switch (request('checkout_to_type')) {
             case 'location':
                 $asset->location_id = $target->id;
+                Asset::where('assigned_type', 'App\Models\Asset')->where('assigned_to', $asset->id)
+                    ->update(['location_id' => $asset->location_id]);
                 break;
             case 'asset':
                 $asset->location_id = $target->rtd_location_id;

app/Models/Asset.php

@@ -386,7 +386,7 @@ class Asset extends Depreciable
      */
     public function components()
     {
-
+        return $this->belongsToMany('\App\Models\Component', 'components_assets', 'asset_id', 'component_id')->withPivot('id', 'assigned_qty', 'created_at')->withTrashed();
     }
 
 
@@ -1324,7 +1324,8 @@ class Asset extends Depreciable
                     $query->where('assets.name', 'LIKE', '%'.$search_val.'%');
                 }
 
-                if ($fieldname == 'product_key') {
+
+                if ($fieldname =='serial') {
                     $query->where('assets.serial', 'LIKE', '%'.$search_val.'%');
                 }
 
@@ -1444,9 +1445,10 @@ class Asset extends Depreciable
              * - snipe 
              *
              */
+
             if (($fieldname!='category') && ($fieldname!='model_number') && ($fieldname!='rtd_location') && ($fieldname!='location') && ($fieldname!='supplier')
                 && ($fieldname!='status_label') && ($fieldname!='model') && ($fieldname!='company') && ($fieldname!='manufacturer')) {
-                $query->orWhere('assets.'.$fieldname, 'LIKE', '%'.$search_val.'%');
+                    $query->where('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');
             }
 
 

app/Presenters/AssetModelPresenter.php

@@ -106,6 +106,14 @@ class AssetModelPresenter extends Presenter
                 'visible' => true,
                 'formatter' => 'fieldsetsLinkObjFormatter',
             ],
+            [
+                'field' => 'requestable',
+                'searchable' => false,
+                'sortable' => true,
+                'visible' => false,
+                'title' => trans('admin/hardware/general.requestable'),
+                'formatter' => 'trueFalseFormatter',
+            ],
             [
                 'field' => 'notes',
                 'searchable' => true,

public/css/build/overrides.css

@@ -554,6 +554,7 @@ th.css-accessory > .th-inner::before {
 .form-group.has-error label {
   color: #a94442;
 }
+
 .select2-container--default .select2-selection--multiple {
   border-radius: 0px;
 }

public/css/dist/all.css

@@ -20465,7 +20465,6 @@ th.css-accessory > .th-inner::before {
   border-radius: 0px;
 }
 
-
 .select2-container {
   box-sizing: border-box;
   display: inline-block;

resources/views/dashboard.blade.php

@@ -446,7 +446,13 @@
           },
           error: function (data) {
               // window.location.reload(true);
-          }
+          },
+      });
+        var last = document.getElementById('statusPieChart').clientWidth;
+        addEventListener('resize', function() {
+        var current = document.getElementById('statusPieChart').clientWidth;
+        if (current != last) location.reload();
+        last = current;
     });
 </script>
 @endpush

resources/views/licenses/view.blade.php

@@ -338,6 +338,17 @@
                   </div>
                   @endif
 
+                  <div class="row">
+                    <div class="col-md-4">
+                      <strong>
+                        {{ trans('admin/licenses/form.maintained') }}
+                      </strong>
+                    </div>
+                    <div class="col-md-8">
+                      {{ $license->maintained ? 'Yes' : 'No' }}
+                    </div>
+                  </div>
+
                   @if (($license->seats) && ($license->seats) > 0)
                   <div class="row">
                     <div class="col-md-3">

resources/views/models/bulk-edit.blade.php

@@ -72,13 +72,30 @@
                                 </div>
                             </div>
 
+                            <!-- requestable -->
+                                <div class="form-group {{ $errors->has('requestable') ? 'has-error' : '' }}">
+                                <div class="col-md-7 col-md-offset-3">
+                            
+
+                                    <div class="checkbox">
+                                        <label for="requestable">
+                                            {{ Form::radio('requestable', '', true, ['aria-label'=>'requestable']) }} Do not change  requestable status<br>
+                                            {{ Form::radio('requestable', '1', old('requestable'), ['aria-label'=>'requestable']) }}  {{  trans('admin/hardware/general.requestable')}} <br>
+                                            {{ Form::radio('requestable', '0', old('requestable'), ['aria-label'=>'requestable']) }}  Not requestable
+    
+                                        </label>
+                                    </div>
+
+                                </div>
+                                </div>
+
                             @foreach ($models as $model)
                                 <input type="hidden" name="ids[{{ $model->id }}]" value="{{ $model->id }}">
                             @endforeach
                         </div>
                     </div> <!--/.box-body-->
 
-                    <div class="box-footer text-right">
+                    <div class="text-right box-footer">
                         <button type="submit" class="btn btn-success"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
                     </div>
                 </div> <!--/.box.box-default-->

resources/views/users/bulk-edit.blade.php

@@ -73,7 +73,7 @@
                                 <div class="checkbox">
                                     <label for="activated">
                                         {{ Form::radio('activated', '', true, ['aria-label'=>'activated']) }} Do not change activation status <br>
-                                        {{ Form::radio('activated', '1', old('activated'), ['aria-label'=>'activated']) }}  User is activated<br>
+                                        {{ Form::radio('activated', '1', old('activated'), ['aria-label'=>'activated']) }}  {{  trans('general.login_enabled')}} <br>
                                         {{ Form::radio('activated', '0', old('activated'), ['aria-label'=>'activated']) }}  User is de-activated
 
                                     </label>
@@ -113,7 +113,7 @@
                         @endforeach
                     </div> <!--/.box-body-->
 
-                    <div class="box-footer text-right">
+                    <div class="text-right box-footer">
                         <button type="submit" class="btn btn-success"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
                     </div>
                 </div> <!--/.box.box-default-->