Fixed incorrect role showing

diff --git a/resources/views/form/model-select.blade.php b/resources/views/form/role-select.blade.php
similarity index 88%
rename from resources/views/form/model-select.blade.php
rename to resources/views/form/role-select.blade.php
index 19b4ccecdb321b1ccb3bb8bcf869c5d040fd1eea..159487d4c93969be0eae0cf03bade746a1573a0c 100644 (file)
--- a/resources/views/form/model-select.blade.php
+++ b/resources/views/form/role-select.blade.php
@@ -3,7 +3,7 @@
     @foreach($options as $option)
         <option value="{{$option->id}}"
                 @if($errors->has($name)) class="neg" @endif
     @foreach($options as $option)
         <option value="{{$option->id}}"
                 @if($errors->has($name)) class="neg" @endif

-                @if(isset($model) || old($name)) @if(old($name) && old($name) === $option->id) selected @elseif(isset($model) && $model->id === $option->id) selected @endif @endif
+                @if(isset($model) || old($name)) @if(old($name) && old($name) === $option->id) selected @elseif(isset($model) && $model->role->id === $option->id) selected @endif @endif

                 >
             {{ $option->$displayKey }}
         </option>
                 >
             {{ $option->$displayKey }}
         </option>

diff --git a/resources/views/users/form.blade.php b/resources/views/users/form.blade.php
index f3896f2e804d9a765e711c37253709bdcf326c44..5e55145fdbe3491bdbdc4186084f8b616c46d1f8 100644 (file)
--- a/resources/views/users/form.blade.php
+++ b/resources/views/users/form.blade.php
@@ -19,7 +19,7 @@
 @if($currentUser->can('user-update'))
     <div class="form-group">
         <label for="role">User Role</label>
 @if($currentUser->can('user-update'))
     <div class="form-group">
         <label for="role">User Role</label>

-        @include('form/model-select', ['name' => 'role', 'options' => \Oxbow\Role::all(), 'displayKey' => 'display_name'])
+        @include('form.role-select', ['name' => 'role', 'options' => \Oxbow\Role::all(), 'displayKey' => 'display_name'])

     </div>
 @endif
 
     </div>
 @endif