Merge branch 'user_management' into dev

This commit is contained in:
Michal Kváček
2016-01-27 02:00:27 +01:00
2 changed files with 3 additions and 3 deletions
@@ -31,7 +31,7 @@
<select name="role">
@foreach($roles as $role => $translation)
<option value="{{$role}}" @if($role == $user->role) selected @endif>@lang($translation)</option>
<option value="{{$role}}" @if($role == $user->role) selected @endif>{{$translation}}</option>
@endforeach
</select>
</label>
@@ -47,7 +47,7 @@
<select name="status">
@foreach($states as $status => $translation)
<option value="{{$status}}" @if($status == $user->status) selected @endif>@lang($translation)</option>
<option value="{{$status}}" @if($status == $user->status) selected @endif>{{$translation}}</option>
@endforeach
</select>
</label>
@@ -36,7 +36,7 @@
<select name="role">
@foreach($roles as $role => $translation)
<option value="{{$role}}">@lang($translation)</option>
<option value="{{$role}}">{{$translation}}</option>
@endforeach
</select>
</label>