Adding new user form

Sergio Oliveira
1 parent d44d52e5
Showing 4 changed files with 39 additions and 20 deletions Show diff stats
src/accounts/forms.py
src/accounts/templates/accounts/user_update_form.html
src/accounts/views.py
src/colab/static/img/logo_nav.png
@@ -10,16 +10,35 @@ from super_archives.models import MailingList
 User = get_user_model()
-class NewUserForm(forms.ModelForm):
+class UserForm(forms.ModelForm):
+    required = ('first_name', 'last_name', 'email', 'username')
+
     class Meta:
         model = User
-        fields = ('first_name', 'last_name', 'email', 'username')
     def __init__(self, *args, **kwargs):
-        super(NewUserForm, self).__init__(*args, **kwargs)
-        for field in self.fields.values():
+        super(UserForm, self).__init__(*args, **kwargs)
+        for field_name, field in self.fields.items():
+            # Adds form-control class to all form fields
             field.widget.attrs.update({'class': 'form-control'})
-            field.required = True
+
+            # Set UserForm.required fields as required
+            if field_name in UserForm.required:
+                field.required = True
+
+
+class UserCreationForm(UserForm):
+    class Meta:
+        model = User
+        fields = ('first_name', 'last_name', 'email', 'username')
+
+
+class UserUpdateForm(UserForm):
+    class Meta:
+        model = User
+        fields = ('first_name', 'last_name', 'email', 'username',
+                  'institution', 'role', 'twitter', 'facebook',
+                  'google_talk', 'webpage')
 class ListsForm(forms.Form):
@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+{% load i18n gravatar %}
+
+{% block main-content %}
+    <form method="post">
+      {% csrf_token %}
+      {{ form.as_p }}
+    
+      <button type="submit" class="btn btn-primary">{% trans "Update" %}</button>
+    </form>
+{% endblock %}
@@ -7,12 +7,13 @@ from django.contrib.auth import get_user_model
 from django.views.generic import DetailView, UpdateView
 from django.utils.translation import ugettext as _
 from django.shortcuts import render, redirect
+from django.core.urlresolvers import reverse
 from colab.deprecated import solrutils
 from colab.deprecated import signup as signup_
 from super_archives.models import EmailAddress, Message
-from .forms import NewUserForm, ListsForm
+from .forms import UserCreationForm, ListsForm, UserUpdateForm
 class UserProfileBaseMixin(object):
@@ -24,23 +25,11 @@ class UserProfileBaseMixin(object):
 class UserProfileUpdateView(UserProfileBaseMixin, UpdateView):
     template_name = 'accounts/user_form.html'
-    #form_class = UserUpdateForm
+    form_class = UserUpdateForm
     def get_success_url(self):
         return reverse('user_profile', kwargs={'username': self.object.username})
-    def get_initial(self):
-        return {
-            'first_name': self.object.first_name,
-            'last_name': self.object.last_name,
-            'email': self.object.email,
-            'institution': self.object.profile.institution,
-            'role': self.object.profile.role,
-            'twitter': self.object.profile.twitter,
-            'facebook': self.object.profile.facebook,
-            'google_talk': self.object.profile.google_talk,
-            'webpage': self.object.profile.webpage,
-        }
 class UserProfileDetailView(UserProfileBaseMixin, DetailView):
@@ -72,7 +61,7 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
 def signup(request):
     # If the request method is GET just return the form
     if request.method == 'GET':
-        user_form = NewUserForm()
+        user_form = UserCreationForm()
         lists_form = ListsForm()
         return render(request, 'accounts/user_create_form.html',
                       {'user_form': user_form, 'lists_form': lists_form})
	@@ -10,16 +10,35 @@ from super_archives.models import MailingList		@@ -10,16 +10,35 @@ from super_archives.models import MailingList
10	User = get_user_model()	10	User = get_user_model()
11		11
12		12
13	-class NewUserForm(forms.ModelForm):	13	+class UserForm(forms.ModelForm):
		14	+ required = ('first_name', 'last_name', 'email', 'username')
		15	+
14	class Meta:	16	class Meta:
15	model = User	17	model = User
16	- fields = ('first_name', 'last_name', 'email', 'username')
17		18
18	def __init__(self, args, *kwargs):	19	def __init__(self, args, *kwargs):
19	- super(NewUserForm, self).__init__(args, *kwargs)
20	- for field in self.fields.values():	20	+ super(UserForm, self).__init__(args, *kwargs)
		21	+ for field_name, field in self.fields.items():
		22	+ # Adds form-control class to all form fields
21	field.widget.attrs.update({'class': 'form-control'})	23	field.widget.attrs.update({'class': 'form-control'})
22	- field.required = True	24	+
		25	+ # Set UserForm.required fields as required
		26	+ if field_name in UserForm.required:
		27	+ field.required = True
		28	+
		29	+
		30	+class UserCreationForm(UserForm):
		31	+ class Meta:
		32	+ model = User
		33	+ fields = ('first_name', 'last_name', 'email', 'username')
		34	+
		35	+
		36	+class UserUpdateForm(UserForm):
		37	+ class Meta:
		38	+ model = User
		39	+ fields = ('first_name', 'last_name', 'email', 'username',
		40	+ 'institution', 'role', 'twitter', 'facebook',
		41	+ 'google_talk', 'webpage')
23		42
24		43
25	class ListsForm(forms.Form):	44	class ListsForm(forms.Form):
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+{% extends "base.html" %}
	2	+{% load i18n gravatar %}
	3	+
	4	+{% block main-content %}
	5	+ <form method="post">
	6	+ {% csrf_token %}
	7	+ {{ form.as_p }}
	8	+
	9	+ <button type="submit" class="btn btn-primary">{% trans "Update" %}</button>
	10	+ </form>
	11	+{% endblock %}