From 0dbce93d1b2721a62b135e3132bdefa5cd13f436 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 15 Oct 2018 17:57:28 -0700
Subject: [PATCH] Better logic for disallowing company selection when user is
 not a superadmin and FCS is enabled

---
 .../forms/edit/company-select.blade.php       | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/resources/views/partials/forms/edit/company-select.blade.php b/resources/views/partials/forms/edit/company-select.blade.php
index 538490d52e..70c75960a8 100644
--- a/resources/views/partials/forms/edit/company-select.blade.php
+++ b/resources/views/partials/forms/edit/company-select.blade.php
@@ -1,26 +1,6 @@
-@if (($snipeSettings->full_multiple_companies_support=='1') && (Auth::user())->isSuperUser())
-
 <!-- Company -->
-<div id="{{ $fieldname }}" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
-    <div class="col-md-7">
-        <select class="js-data-ajax" data-endpoint="companies" data-placeholder="{{ trans('general.select_company') }}" name="{{ $fieldname }}" style="width: 100%" id="company_select">
-            @if ($company_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
-                <option value="{{ $company_id }}" selected="selected">
-                    {{ (\App\Models\Company::find($company_id)) ? \App\Models\Company::find($company_id)->name : '' }}
-                </option>
-            @else
-                <option value="">{{ trans('general.select_company') }}</option>
-            @endif
-        </select>
-    </div>
-
-
-    {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fa fa-times"></i> :message</span></div>') !!}
-
-</div>
-
-@else
+@if (($snipeSettings->full_multiple_companies_support=='1') && (!Auth::user())->isSuperUser())
+    <!-- full company support is enabled and this user isn't a superadmin -->
     <div class="form-group">
         {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
         <div class="col-md-7">
@@ -29,4 +9,24 @@
         </div>
 
     </div>
+
+@else
+    <!-- full company support is enabled or this user is a superadmin -->
+    <div id="{{ $fieldname }}" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
+        {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+        <div class="col-md-7">
+            <select class="js-data-ajax" data-endpoint="companies" data-placeholder="{{ trans('general.select_company') }}" name="{{ $fieldname }}" style="width: 100%" id="company_select">
+                @if ($company_id = Input::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
+                    <option value="{{ $company_id }}" selected="selected">
+                        {{ (\App\Models\Company::find($company_id)) ? \App\Models\Company::find($company_id)->name : '' }}
+                    </option>
+                @else
+                    <option value="">{{ trans('general.select_company') }}</option>
+                @endif
+            </select>
+        </div>
+        {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fa fa-times"></i> :message</span></div>') !!}
+
+    </div>
+
 @endif