cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2025-08-02 19:20:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 14b7276829 into a1ec736a9f

Browse Source
This commit is contained in:
Areski Belaid 2015-11-11 17:48:41 +00:00
commit c396d19776
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_form.html
View File

@ -10,7 +10,7 @@
{{ form|crispy }} {{ form|crispy }}
<div class="control-group"> <div class="control-group">
<div class="controls"> <div class="controls">
<button type="submit" class="btn">Update</button> <button type="submit" class="btn btn-primary">Update</button>
</div> </div>
</div> </div>
</form> </form>

2
{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/0001_initial.py
View File

@ -30,7 +30,7 @@ class Migration(migrations.Migration):
('date_joined', models.DateTimeField(verbose_name='date joined', default=django.utils.timezone.now)), ('date_joined', models.DateTimeField(verbose_name='date joined', default=django.utils.timezone.now)),
('groups', models.ManyToManyField(related_name='user_set', blank=True, verbose_name='groups', to='auth.Group', help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_query_name='user')), ('groups', models.ManyToManyField(related_name='user_set', blank=True, verbose_name='groups', to='auth.Group', help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_query_name='user')),
('user_permissions', models.ManyToManyField(related_name='user_set', blank=True, verbose_name='user permissions', to='auth.Permission', help_text='Specific permissions for this user.', related_query_name='user')), ('user_permissions', models.ManyToManyField(related_name='user_set', blank=True, verbose_name='user permissions', to='auth.Permission', help_text='Specific permissions for this user.', related_query_name='user')),
('name', models.CharField(max_length=255, verbose_name='Name of User', blank=True)), ('nickname', models.CharField(max_length=255, verbose_name='Nickname', blank=True)),
], ],
options={ options={
'verbose_name': 'user', 'verbose_name': 'user',

4
{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/models.py
View File

@ -11,9 +11,7 @@ from django.utils.translation import ugettext_lazy as _
@python_2_unicode_compatible @python_2_unicode_compatible
class User(AbstractUser): class User(AbstractUser):
# First Name and Last Name do not cover name patterns nickname = models.CharField(_("Nickname"), blank=True, max_length=255)
# around the globe.
name = models.CharField(_("Name of User"), blank=True, max_length=255)
def __str__(self): def __str__(self):
return self.username return self.username

2
{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/views.py
View File

@ -26,7 +26,7 @@ class UserRedirectView(LoginRequiredMixin, RedirectView):
class UserUpdateView(LoginRequiredMixin, UpdateView): class UserUpdateView(LoginRequiredMixin, UpdateView):
fields = ['name', ] fields = ['nickname', 'first_name', 'last_name', ]
# we already imported User in the view code above, remember? # we already imported User in the view code above, remember?
model = User model = User