Ajustes no template e no campo de senha de de criar usuario

Jailson Dias
1 parent 999ebc8a
Showing 4 changed files with 55 additions and 57 deletions Show diff stats
amadeus/settings.py
core/context_processors.py
users/forms.py
users/templates/users/create.html
@@ -78,8 +78,8 @@ TEMPLATES = [
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
-                # 'core.context_processors.notifications',
-                # 'courses.context_processors.courses',
+                'core.context_processors.notifications',
+                'courses.context_processors.courses',
             ],
         },
     },
@@ -3,9 +3,8 @@ from .models import Notification
 def notifications(request):
 	context = {}
 	context['notifications'] = None
-	if not request.user is None:
-		if request.user.is_authenticated:
-			return {
-			   'notifications': Notification.objects.filter(user= request.user, read=False).order_by('-datetime')
-			}
+	if request.user.is_authenticated:
+		return {
+		   'notifications': Notification.objects.filter(user= request.user, read=False).order_by('-datetime')
+		}
 	return context
@@ -4,6 +4,7 @@ from django.conf import settings
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from rolepermissions.shortcuts import assign_role
+from django.contrib.auth.forms import UserCreationForm
 from .models import User
@@ -22,35 +23,32 @@ class ProfileForm(forms.ModelForm):
 		fields = ['username', 'name', 'email', 'password', 'birth_date', 'city', 'state', 'gender', 'cpf', 'phone', 'image']
 		widgets = {
 			'password':forms.PasswordInput
-		}	
-
-class UserForm(forms.ModelForm):
-	def save(self, commit=True):
-		super(UserForm, self).save(commit=False)
-
-		#if not self.instance.image:
-		#	self.instance.image = os.path.join(os.path.dirname(settings.BASE_DIR), 'uploads', 'no_image.jpg')
-
-		self.instance.set_password(self.cleaned_data['password'])
-		self.instance.save()
-
-		if self.instance.is_staff:
-			assign_role(self.instance, 'system_admin')
-		elif self.instance.type_profile == 2:
-			assign_role(self.instance, 'student')
-		elif self.instance.type_profile == 1:
-			assign_role(self.instance, 'professor')
-
-		self.instance.save()
+		}
-		return self.instance
+class UserForm(UserCreationForm):
+	# def save(self, commit=True):
+	# 	super(UserForm, self).save()
+	#
+	# 	#if not self.instance.image:
+	# 	#	self.instance.image = os.path.join(os.path.dirname(settings.BASE_DIR), 'uploads', 'no_image.jpg')
+	#
+	# 	# self.instance.set_password(self.cleaned_data['password'])
+	# 	# self.instance.save()
+	#
+	# 	if self.instance.is_staff:
+	# 		assign_role(self.instance, 'system_admin')
+	# 	elif self.instance.type_profile == 2:
+	# 		assign_role(self.instance, 'student')
+	# 	elif self.instance.type_profile == 1:
+	# 		assign_role(self.instance, 'professor')
+	#
+	# 	self.instance.save()
+	#
+	# 	return self.instance
 	class Meta:
 		model = User
-		fields = ['username', 'name', 'email', 'password', 'birth_date', 'city', 'state', 'gender', 'type_profile', 'cpf', 'phone', 'image', 'is_staff', 'is_active']
-		widgets = {
-			'password':forms.PasswordInput
-		}
+		fields = ['username', 'name', 'email', 'birth_date', 'city', 'state', 'gender', 'type_profile', 'cpf', 'phone', 'image', 'is_staff', 'is_active']
 class EditUserForm(forms.ModelForm):
@@ -32,30 +32,31 @@
 					{% csrf_token %}
 					{% for field in form %}
 						<div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput">
-							<label for="{{ field.auto_id }}">{{ field.label }}</label>
 							{% if field.auto_id == 'id_birth_date' %}
-								{% render_field field class='form-control input-sm' type='date' %}
-								<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
+                <label for="{{ field.auto_id }}">{{ field.label }}</label>
+								<input type="date" class="form-control"name="{{field.name}}" value="{% if field.value.year %}{{field.value|date:'Y-m-d'}}{% else %}{{field.value}}{% endif %}">
 							{% elif field.auto_id == 'id_image' %}
-								{% render_field field class='form-control input-sm' %}
+                <label for="{{ field.auto_id }}">{{ field.label }}</label>
+								{% render_field field class='form-control' %}
 								<div class="input-group">
-				                    <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}">
-				                    <span class="input-group-btn input-group-sm">
-				                        <button type="button" class="btn btn-fab btn-fab-mini">
-				                          	<i class="material-icons">attach_file</i>
-				                        </button>
-				                    </span>
-				                </div>
-				            {% elif field.auto_id == 'id_is_staff' or field.auto_id == 'id_is_active' %}
-				            	<div class="checkbox">
-				            		<label>
-				            			{% render_field field type='checkbox' %}  	
-				            		</label>
-						        </div>
+                  <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}">
+                  <span class="input-group-btn input-group-sm">
+                    <button type="button" class="btn btn-fab btn-fab-mini">
+                    	<i class="material-icons">attach_file</i>
+                    </button>
+                  </span>
+                </div>
+				      {% elif field.auto_id == 'id_is_staff' or field.auto_id == 'id_is_active' %}
+                <div class="checkbox">
+                  <label>
+                      <input type="checkbox" name="checkbox"><span class="checkbox-material"><span class="check"></span></span> {{field.label}}
+                  </label>
+                </div>
 							{% else %}
-								{% render_field field class='form-control input-sm' %}
-								<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
+                <label for="{{ field.auto_id }}">{{ field.label }}</label>
+								{% render_field field class='form-control' %}
 							{% endif %}
+              <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
 							{% if field.errors.length > 0 %}
 								<div class="alert alert-danger alert-dismissible" role="alert">
 				  					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
@@ -67,20 +68,20 @@
 										{% endfor %}
 									</ul>
 								</div>
-							</div>
 							{% endif %}
 						</div>
 					{% endfor %}
 					<div class="col-md-offset-2 col-md-2 col-sm-2 col-xs-2">
-						<input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />	
+						<input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
 					</div>
 					<div class="col-md-offset-3 col-md-2 col-sm-2 col-xs-2">
-						<a href="{% url 'users:manage' %}" class="btn btn-sm btn-success" >{% trans 'Cancel' %}</a>	
+						<a href="{% url 'users:manage' %}" class="btn btn-sm btn-default" >{% trans 'Cancel' %}</a>
 					</div>
 				</form>
 			</div>
 		</div>
-	</div>
-	
-	<br clear="all" />
+  </div>
+</br>
+</br>
+</br>
 {% endblock %}