Merge remote-tracking branch 'inventree/master'

This commit is contained in:
Oliver Walters 2019-09-19 15:43:15 +10:00
commit 41d91a8f9b
2 changed files with 5 additions and 0 deletions

View File

@ -43,6 +43,7 @@ class EditUserForm(HelperForm):
class Meta: class Meta:
model = User model = User
fields = [ fields = [
'username',
'first_name', 'first_name',
'last_name', 'last_name',
'email' 'email'

View File

@ -19,6 +19,10 @@
</div> </div>
<table class='table table-striped table-condensed'> <table class='table table-striped table-condensed'>
<tr>
<td>Username</td>
<td>{{ user.username }}</td>
</tr>
<tr> <tr>
<td>First Name</td> <td>First Name</td>
<td>{{ user.first_name }}</td> <td>{{ user.first_name }}</td>