Merge branch 'dev' of https://github.com/amadeusproject/amadeuslms into dev

Matheus Lins
2 parents 6a60d3e2 f93a3aa6
Showing 14 changed files with 161 additions and 111 deletions Show diff stats
core/static/js/base/amadeus.js
core/tests.py
courses/templates/subject/form_view_student.html
forum/static/js/forum.js
forum/templates/forum/forum_view.html
links/forms.py
links/views.py
users/admin.py
users/forms.py
users/templates/users/edit_profile.html
users/templates/users/profile.html
users/templates/users/update.html
users/urls.py
users/views.py
@@ -16,7 +16,7 @@ function campoNumerico(campo, evento){
     	evento.returnValue = false;
   	    return false;
     }
-}
+};
 function formatarCpf(campo, evento){
 	var codTecla;
@@ -47,85 +47,37 @@ function formatarCpf(campo, evento){
 		return false;
 	}
 	return false;
-}
+};
-function validarCpfSemAlert(campo,nome,idElementoMensagemErro){
-	//alert("teste");
-	cpf = campo.value;
-
-	cpf = cpf.replace(".","");
-	cpf = cpf.replace("-","");
-	cpf = cpf.replace(".","");
-	retorno = true;
+function formatarTelefone(campo, evento){
+	var codTecla;
+	var tamanho;
+	if( document.all ) { // Internet Explorer
+		codTecla = evento.keyCode;
+	} else if( document.layers ) { // Nestcape
+		codTecla = evento.which;
+	} else if( evento ) { // Firefox
+   		codTecla = evento.which;
+	}
+	tamanho = campo.value.length;
-	if(trim(cpf).length > 0){
-		//alert("teste2");
-		cpfstr= '';
-		temp = cpf + '';
-
-		cpfstr = temp.substring(0,3);
-		cpfstr = cpfstr + temp.substring(3,6);
-		cpfstr = cpfstr + temp.substring(6,9);
-		cpfstr = cpfstr + temp.substring(9,11);
-
-		
-
-		retorno = false;
-		if(cpf != null){
-			//alert("teste3");
-			soma = 0;
-			digito1 = 0;
-			digito2 = 0;
-			for(i = 0; i < 9; i = i + 1) {
-				soma = soma + ((parseInt(cpf.substring(i,i+1)))*(11-(i+1)));
-			}
-			soma = soma % 11;
-			if (soma == 0 || soma == 1) {
-				digito1 = 0;
-			} else {
-				digito1 = 11 - soma;
-			}
-			soma = 0;
-
-			for(i = 0; i < 9; i = i + 1) {
-				soma = soma + ((parseInt(cpf.substring(i,i+1)))*(12-(i+1)));
-			}
-			soma = soma + (digito1*2);
-			soma = soma % 11;
-			if (soma == 0 || soma == 1) {
-				digito2 = 0;
-			}
-			else{
-				digito2 = 11 - soma;
-			}
-			digito = digito1 +''+ digito2;
-			
-			
-			//alert(cpfstr.substring(9,11));
-			if(digito == (cpfstr.substring(9,11))){
-				retorno = true;
-			} else{
-				//alert("teste4");
-				retorno = false;
-
-			}
-		} else {
-			retorno = false;
+	if((codTecla > 47 && codTecla < 58) && tamanho < 14){
+	
+		if(tamanho == 0){
+			campo.value = "(" + campo.value;
+		}else if( tamanho == 3 ){
+			campo.value = campo.value + ")";
+		}else if(tamanho == 9){
+			campo.value = campo.value + "-";
 		}
-	}else{
-		retorno = false;
-	}
-	//alert(retorno);
-	if(retorno == false){
-		//alert('E-mail informado invalido! Por favor, especifique um E-mail válido para o campo \"' + nome + '\".');
-		document.getElementById(idElementoMensagemErro).style.display = '';
-		campo.focus();
-		return false;
-	}else{
-		document.getElementById(idElementoMensagemErro).style.display = 'none';
 		return true;
+	} else if(codTecla == 0 || codTecla == 8){
+		return true;
+	} else {
+		evento.returnValue = false;
+		return false;
 	}
-	return retorno;
+	return false;
 }
 /*
@@ -165,21 +165,21 @@ class UpdateUserTestCase(TestCase):
         data = {'username': 'test', 'password': 'testing1'}
         response = self.client.post(reverse('core:home'), data)
         self.assertRedirects(response, reverse('app:index'))
-        
         data={
-                'username': 'testeamadeus',
-                'email': 'teste@amadeus.com',
+                'username': 'test',
+                'birth_date': '12/12/2000',
+                'email': 'testing@amadeus.com',
+                'cpf': '705.089.884-89',
                 'name': 'Teste Amadeus',
                 'city': 'Praia',
                 'state': 'PE',
                 'gender': 'F',
             }
-        # self.assertRedirects(response1, reverse('app:index'))
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, 200)
         response = self.client.post(self.url, data)
-        self.assertEqual(response.status_code, 302)
+        self.assertRedirects(response, reverse('users:profile'))
     def test_update_error(self):
@@ -195,12 +195,13 @@ class UpdateUserTestCase(TestCase):
                 'username': '',
                 'email': 'teste@amadeus.com',
                 'name': 'Teste Amadeus',
+                'birth_date': '12/12/2000',
                 'city': 'Praia',
                 'state': 'PE',
                 'gender': 'F',
             }
         response = self.client.post(self.url, data)
-        self.assertFormError(response, 'form', 'username', 'This field is required.')
+        self.assertFormError(response, 'form', 'username', _('This field is required.'))
 class DeleteUserTestCase(TestCase):
-{% load i18n %}
+{% load static i18n list_topic_foruns %}
 {% block javascript %}
     <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
@@ -57,7 +57,9 @@ function createForum(url, topic) {
             $(".forum_form").html(data);
             $("#id_topic").val(topic);
-            $('.date-picker').datepicker();
+            $('.date-picker').datepicker({
+                format: 'dd/mm/yyyy',
+            });
             var frm = $('#forum_create');
             frm.submit(function () {
@@ -92,15 +94,16 @@ function createForum(url, topic) {
 * Function to load edit forum's form and set the submit function
 *
 */
-function editForum(url, forum) {
+function editForum(url, forum, success_message) {
     $.ajax({
         url: url, 
         data: {'pk': forum},
         success: function(data) {
             $(".forum_form").html(data);
-            //$("#id_topic").val(topic);
-            $('.date-picker').datepicker();
+            $('.date-picker').datepicker({
+                format: 'dd/mm/yyyy',
+            });
             var frm = $('#forum_create');
             frm.submit(function () {
@@ -111,6 +114,8 @@ function editForum(url, forum) {
                     success: function (data) {
                         $('.forum_view').html(data);
+                        alertify.success(success_message);
+
                         $("#editForum").modal('hide');
                     },
                     error: function(data) {
@@ -41,7 +41,7 @@
             </div>
             <div class="panel-body">
                 <ul class="nav nav-pills nav-stacked">
-                    <li><a href="javascript:editForum('{% url 'course:forum:update' forum.id %}', '{{ forum.id }}')">{% trans 'Edit' %}</a></li>
+                    <li><a href="javascript:editForum('{% url 'course:forum:update' forum.id %}', '{{ forum.id }}', '{% trans 'Forum edited successfully!' %}')">{% trans 'Edit' %}</a></li>
                     <li><a href="javascript:delete_forum('{% url 'course:forum:delete' forum.id %}', '{{ forum.id }}', '{% trans "Are you sure you want to delete this forum?" %}', '{% url 'course:view_subject' forum.topic.subject.slug %}')">{% trans 'Delete' %}</a></li>
                 </ul>
             </div>
@@ -0,0 +1,12 @@
+from django import forms
+from .models import Link
+
+class CreateLinkForm(forms.ModelForm):
+    class Meta:
+        model = Link
+        fields = ['name','link','description']
+        
+class UpdateLinkForm(forms.ModelForm):
+    class Meta:
+        model = Link
+        fields = ['name','link','description']
 from django.shortcuts import render
+from django.views import generic
+from django.core.urlresolvers import reverse_lazy
+from django.contrib import messages
+from django.utils.translation import ugettext_lazy as _
+
+
+from .models import Link
+from .forms import *
 # Create your views here.
+class CreateLink(generic.CreateView):
+    template_name = 'links/'
+    form_class = CreateLinkForm
+    success_url = reverse_lazy()
+    def form_valid(self, form):
+		form.save()
+		messages.success(self.request, _('Link created successfully!'))
+		return super(CreateLink, self).form_valid(form)
+
+
+class DeleteLink(generic.DeleteView):
+
+class UpdateLink(generic.UpdateView):
+    template_name = 'links/'
+    form_class = UpdateLinkForm
+    success_url = reverse_lazy()
+    def form_valid(self, form):
+		form.save()
+		messages.success(self.request, _('Link updated successfully!'))
+
+		return super(UpdateLink, self).form_valid(form)
 from django.contrib import admin
 from .models import User
-from .forms import UserForm
+from .forms import AdminUserForm
 class UserAdmin(admin.ModelAdmin):
 	list_display = ['username', 'name', 'email', 'is_staff', 'is_active']
 	search_fields = ['username', 'name', 'email']
-	# form = UserForm
+	form = AdminUserForm
 admin.site.register(User, UserAdmin)
 \ No newline at end of file
 # coding=utf-8
-import os
+import os, re
+from datetime import date
+from pycpfcnpj import cpfcnpj
 from django.conf import settings
 from django import forms
 from django.utils.translation import ugettext_lazy as _
@@ -8,20 +10,27 @@ from django.contrib.auth.forms import UserCreationForm
 from core.forms import RegisterUserForm
 from .models import User
-
-class ProfileForm(forms.ModelForm):
-
+class AdminUserForm(forms.ModelForm):
 	def save(self, commit=True):
-		super(ProfileForm, self).save(commit=False)
+		super(AdminUserForm, self).save(commit=False)
 		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', 'cpf', 'phone', 'image']
+		fields = ['username', 'name', 'email', 'password', 'birth_date', 'city', 'state', 'gender', 'type_profile', 'cpf', 'phone', 'image', 'is_staff', 'is_active']
 		widgets = {
 			'password':forms.PasswordInput
 		}
@@ -32,16 +41,33 @@ class UserForm(RegisterUserForm):
 		model = User
 		fields = ['username', 'name', 'email', 'birth_date', 'city', 'state', 'gender', 'type_profile', 'cpf', 'phone', 'image', 'is_staff', 'is_active']
-class EditUserForm(forms.ModelForm):
+class UpdateUserForm(forms.ModelForm):
+
+	def validate_cpf(self, cpf):
+		cpf = ''.join(re.findall('\d', str(cpf)))
+        
+		if cpfcnpj.validate(cpf):
+			return True
+		return False
+
+	def clean_cpf(self):
+		cpf = self.cleaned_data['cpf']
+		if not self.validate_cpf(cpf):
+			raise forms.ValidationError(_('Please enter a valid CPF'))
+		return cpf
+
+	def clean_birth_date(self):
+		birth_date = self.cleaned_data['birth_date']
+		if birth_date >= date.today():
+			raise forms.ValidationError(_('Please enter a valid date'))
+		return birth_date
 	class Meta:
 		model = User
-		fields = ['username', 'name', 'email', 'birth_date', 'city', 'state', 'gender', 'cpf', 'phone', 'image']
+		fields = ['username', 'name', 'email', 'city', 'state', 'birth_date', 'gender', 'type_profile', 'cpf', 'phone', 'image', 'is_staff', 'is_active']
-# Ailson
-class UpdateUserForm(forms.ModelForm):
-	company_logo = forms.ImageField(label=_('Company Logo'),required=False, error_messages = {'invalid':_("Image files only")})
+class UpdateProfileForm(UpdateUserForm):
 	class Meta:
 		model = User
-		fields = ['username', 'name', 'email', 'city', 'state', 'birth_date', 'gender', 'cpf', 'phone', 'image']
 \ No newline at end of file
+		fields = ['username', 'name', 'email', 'birth_date', 'city', 'state', 'gender', 'cpf', 'phone', 'image']
@@ -31,7 +31,7 @@
 						<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' %}
-								<input type="date" class="form-control"name="{{field.name}}" value="{% if field.value.year %}{{field.value|date:'Y-m-d'}}{% else %}{{field.value}}{% endif %}" min="{{now|date:'Y-m-d'}}" id="{{ field.auto_id }}">
+								<input type="text" class="form-control date-picker"name="{{field.name}}" value="{% if field.value.year %}{{field.value|date:'Y-m-d'}}{% else %}{{field.value}}{% endif %}" min="{{now|date:'Y-m-d'}}" id="{{ field.auto_id }}">
 								<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
 							{% elif field.auto_id == 'id_image' %}
 								{% render_field field class='form-control input-sm' %}
@@ -49,11 +49,16 @@
 				            			{% render_field field type='checkbox' %}  	
 				            		</label>
 						        </div>
+						    {% elif field.auto_id == 'id_cpf' %}
+                				{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarCpf(this,event);' %}
+
+                			{% elif field.auto_id == 'id_phone' %}
+                				{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
 							{% else %}
 								{% render_field field class='form-control' %}
 								<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
 							{% endif %}
-							{% if field.errors.length > 0 %}
+							{% if field.errors %}
 								<div class="alert alert-danger alert-dismissible" role="alert">
 				  					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
 				  						<span aria-hidden="true">&times;</span>
@@ -64,7 +69,6 @@
 										{% endfor %}
 									</ul>
 								</div>
-							</div>
 							{% endif %}
 						</div>
 					{% endfor %}
@@ -27,6 +27,17 @@
 {% endblock %}
 {% block content %}
+	{% if messages %}
+		{% for message in messages %}
+			<div class="alert alert-success alert-dismissible" role="alert">
+				<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+					<span aria-hidden="true">&times;</span>
+				</button>
+				<p>{{ message }}</p>
+			</div>
+		{% endfor %}
+	{% endif %}
+	
 	<div class="row">
 		<div class="col-lg-offset-4 col-lg-2">
 			<img src="" class="img-responsive center-block " alt="logo amadeus">
@@ -34,7 +34,7 @@
 						<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' %}
-								<input type="date" class="form-control"name="{{field.name}}" value="{% if field.value.year %}{{field.value|date:'Y-m-d'}}{% else %}{{field.value}}{% endif %}" min="{{now|date:'Y-m-d'}}" id="{{ field.auto_id }}">
+								<input type="text" class="form-control date-picker"name="{{field.name}}" value="{% if field.value.year %}{{field.value|date:'Y-m-d'}}{% else %}{{field.value}}{% endif %}" min="{{now|date:'Y-m-d'}}" id="{{ field.auto_id }}">
 								<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
 							{% elif field.auto_id == 'id_image' %}
 								{% render_field field class='form-control input-sm' %}
@@ -48,6 +48,16 @@
 				                </div>
 						    {% elif field.auto_id == 'id_cpf' %}
                 				{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarCpf(this,event);' %}
+
+                			{% elif field.auto_id == 'id_phone' %}
+                				{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
+                				
+                			{% elif field.auto_id == 'id_is_staff' or field.auto_id == 'id_is_active' %}
+                				<div class="checkbox">
+                  					<label for="{{ field.auto_id }}">
+                      					{% render_field field %}<span class="checkbox-material"><span class="check"></span></span> {{field.label}}
+                  					</label>
+                				</div>
 							{% else %}
 								{% render_field field class='form-control' %}
 								<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
@@ -11,6 +11,6 @@ urlpatterns = [
 	url(r'^profile/$', views.Profile.as_view(), name='profile'),
 	url(r'^profile/editar/(?P<username>[\w_-]+)/$', views.EditProfile.as_view(), name='edit_profile'),
 	#
-	url(r'^profile/update/$', views.UpdateUser.as_view(), name='update_profile'),
+	url(r'^profile/update/$', views.UpdateProfile.as_view(), name='update_profile'),
 	url(r'^profile/delete/$', views.DeleteUser.as_view(), name='delete_profile'), 
 ]
@@ -8,7 +8,7 @@ from django.core.urlresolvers import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from rolepermissions.shortcuts import assign_role
 from .models import User
-from .forms import UserForm, ProfileForm, UpdateUserForm
+from .forms import UserForm, UpdateProfileForm, UpdateUserForm
 # ================ ADMIN =======================
 class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView):
@@ -103,13 +103,13 @@ def delete(request,username):
-class UpdateUser(LoginRequiredMixin, generic.edit.UpdateView):
+class UpdateProfile(LoginRequiredMixin, generic.edit.UpdateView):
 	allowed_roles = ['student']
 	login_url = reverse_lazy("core:home")
 	template_name = 'users/edit_profile.html'
-	form_class = UpdateUserForm
-	success_url = reverse_lazy('users:update_profile')
+	form_class = UpdateProfileForm
+	success_url = reverse_lazy('users:profile')
 	def get_object(self):
 		user = get_object_or_404(User, username = self.request.user.username)
@@ -119,7 +119,7 @@ class UpdateUser(LoginRequiredMixin, generic.edit.UpdateView):
 		form.save()
 		messages.success(self.request, _('Profile edited successfully!'))
-		return super(UpdateUser, self).form_valid(form)
+		return super(UpdateProfile, self).form_valid(form)
 class DeleteUser(LoginRequiredMixin, generic.edit.DeleteView):
 	allowed_roles = ['student']
	@@ -16,7 +16,7 @@ function campoNumerico(campo, evento){		@@ -16,7 +16,7 @@ function campoNumerico(campo, evento){
16	evento.returnValue = false;	16	evento.returnValue = false;
17	return false;	17	return false;
18	}	18	}
19	-}	19	+};
20		20
21	function formatarCpf(campo, evento){	21	function formatarCpf(campo, evento){
22	var codTecla;	22	var codTecla;
	@@ -47,85 +47,37 @@ function formatarCpf(campo, evento){		@@ -47,85 +47,37 @@ function formatarCpf(campo, evento){
47	return false;	47	return false;
48	}	48	}
49	return false;	49	return false;
50	-}	50	+};
51		51
52	-function validarCpfSemAlert(campo,nome,idElementoMensagemErro){
53	- //alert("teste");
54	- cpf = campo.value;
55	-
56	- cpf = cpf.replace(".","");
57	- cpf = cpf.replace("-","");
58	- cpf = cpf.replace(".","");
59	- retorno = true;	52	+function formatarTelefone(campo, evento){
		53	+ var codTecla;
		54	+ var tamanho;
		55	+ if( document.all ) { // Internet Explorer
		56	+ codTecla = evento.keyCode;
		57	+ } else if( document.layers ) { // Nestcape
		58	+ codTecla = evento.which;
		59	+ } else if( evento ) { // Firefox
		60	+ codTecla = evento.which;
		61	+ }
		62	+ tamanho = campo.value.length;
60		63
61	- if(trim(cpf).length > 0){
62	- //alert("teste2");
63	- cpfstr= '';
64	- temp = cpf + '';
65	-
66	- cpfstr = temp.substring(0,3);
67	- cpfstr = cpfstr + temp.substring(3,6);
68	- cpfstr = cpfstr + temp.substring(6,9);
69	- cpfstr = cpfstr + temp.substring(9,11);
70	-
71	-
72	-
73	- retorno = false;
74	- if(cpf != null){
75	- //alert("teste3");
76	- soma = 0;
77	- digito1 = 0;
78	- digito2 = 0;
79	- for(i = 0; i < 9; i = i + 1) {
80	- soma = soma + ((parseInt(cpf.substring(i,i+1)))*(11-(i+1)));
81	- }
82	- soma = soma % 11;
83	- if (soma == 0 \|\| soma == 1) {
84	- digito1 = 0;
85	- } else {
86	- digito1 = 11 - soma;
87	- }
88	- soma = 0;
89	-
90	- for(i = 0; i < 9; i = i + 1) {
91	- soma = soma + ((parseInt(cpf.substring(i,i+1)))*(12-(i+1)));
92	- }
93	- soma = soma + (digito1*2);
94	- soma = soma % 11;
95	- if (soma == 0 \|\| soma == 1) {
96	- digito2 = 0;
97	- }
98	- else{
99	- digito2 = 11 - soma;
100	- }
101	- digito = digito1 +''+ digito2;
102	-
103	-
104	- //alert(cpfstr.substring(9,11));
105	- if(digito == (cpfstr.substring(9,11))){
106	- retorno = true;
107	- } else{
108	- //alert("teste4");
109	- retorno = false;
110	-
111	- }
112	- } else {
113	- retorno = false;	64	+ if((codTecla > 47 && codTecla < 58) && tamanho < 14){
		65	+
		66	+ if(tamanho == 0){
		67	+ campo.value = "(" + campo.value;
		68	+ }else if( tamanho == 3 ){
		69	+ campo.value = campo.value + ")";
		70	+ }else if(tamanho == 9){
		71	+ campo.value = campo.value + "-";
114	}	72	}
115	- }else{
116	- retorno = false;
117	- }
118	- //alert(retorno);
119	- if(retorno == false){
120	- //alert('E-mail informado invalido! Por favor, especifique um E-mail válido para o campo \"' + nome + '\".');
121	- document.getElementById(idElementoMensagemErro).style.display = '';
122	- campo.focus();
123	- return false;
124	- }else{
125	- document.getElementById(idElementoMensagemErro).style.display = 'none';
126	return true;	73	return true;
		74	+ } else if(codTecla == 0 \|\| codTecla == 8){
		75	+ return true;
		76	+ } else {
		77	+ evento.returnValue = false;
		78	+ return false;
127	}	79	}
128	- return retorno;	80	+ return false;
129	}	81	}
130		82
131	/*	83	/*
1	-{% load i18n %}	1	+{% load static i18n list_topic_foruns %}
2		2
3	{% block javascript %}	3	{% block javascript %}
4	<script type="text/javascript" src="{% static 'js/forum.js' %}"></script>	4	<script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
	@@ -41,7 +41,7 @@		@@ -41,7 +41,7 @@
41	</div>	41	</div>
42	<div class="panel-body">	42	<div class="panel-body">
43	<ul class="nav nav-pills nav-stacked">	43	<ul class="nav nav-pills nav-stacked">
44	- <li><a href="javascript:editForum('{% url 'course:forum:update' forum.id %}', '{{ forum.id }}')">{% trans 'Edit' %}</a></li>	44	+ <li><a href="javascript:editForum('{% url 'course:forum:update' forum.id %}', '{{ forum.id }}', '{% trans 'Forum edited successfully!' %}')">{% trans 'Edit' %}</a></li>
45	<li><a href="javascript:delete_forum('{% url 'course:forum:delete' forum.id %}', '{{ forum.id }}', '{% trans "Are you sure you want to delete this forum?" %}', '{% url 'course:view_subject' forum.topic.subject.slug %}')">{% trans 'Delete' %}</a></li>	45	<li><a href="javascript:delete_forum('{% url 'course:forum:delete' forum.id %}', '{{ forum.id }}', '{% trans "Are you sure you want to delete this forum?" %}', '{% url 'course:view_subject' forum.topic.subject.slug %}')">{% trans 'Delete' %}</a></li>
46	</ul>	46	</ul>
47	</div>	47	</div>
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+from django import forms
	2	+from .models import Link
	3	+
	4	+class CreateLinkForm(forms.ModelForm):
	5	+ class Meta:
	6	+ model = Link
	7	+ fields = ['name','link','description']
	8	+
	9	+class UpdateLinkForm(forms.ModelForm):
	10	+ class Meta:
	11	+ model = Link
	12	+ fields = ['name','link','description']
1	from django.shortcuts import render	1	from django.shortcuts import render
		2	+from django.views import generic
		3	+from django.core.urlresolvers import reverse_lazy
		4	+from django.contrib import messages
		5	+from django.utils.translation import ugettext_lazy as _
		6	+
		7	+
		8	+from .models import Link
		9	+from .forms import *
2		10
3	# Create your views here.	11	# Create your views here.
		12	+class CreateLink(generic.CreateView):
		13	+ template_name = 'links/'
		14	+ form_class = CreateLinkForm
		15	+ success_url = reverse_lazy()
		16	+ def form_valid(self, form):
		17	+ form.save()
		18	+ messages.success(self.request, _('Link created successfully!'))
		19	+ return super(CreateLink, self).form_valid(form)
		20	+
		21	+
		22	+class DeleteLink(generic.DeleteView):
		23	+
		24	+class UpdateLink(generic.UpdateView):
		25	+ template_name = 'links/'
		26	+ form_class = UpdateLinkForm
		27	+ success_url = reverse_lazy()
		28	+ def form_valid(self, form):
		29	+ form.save()
		30	+ messages.success(self.request, _('Link updated successfully!'))
		31	+
		32	+ return super(UpdateLink, self).form_valid(form)
1	from django.contrib import admin	1	from django.contrib import admin
2	from .models import User	2	from .models import User
3	-from .forms import UserForm	3	+from .forms import AdminUserForm
4		4
5	class UserAdmin(admin.ModelAdmin):	5	class UserAdmin(admin.ModelAdmin):
6	list_display = ['username', 'name', 'email', 'is_staff', 'is_active']	6	list_display = ['username', 'name', 'email', 'is_staff', 'is_active']
7	search_fields = ['username', 'name', 'email']	7	search_fields = ['username', 'name', 'email']
8	- # form = UserForm	8	+ form = AdminUserForm
9		9
10	admin.site.register(User, UserAdmin)	10	admin.site.register(User, UserAdmin)
11	\ No newline at end of file	11	\ No newline at end of file
	@@ -27,6 +27,17 @@		@@ -27,6 +27,17 @@
27	{% endblock %}	27	{% endblock %}
28		28
29	{% block content %}	29	{% block content %}
		30	+ {% if messages %}
		31	+ {% for message in messages %}
		32	+ <div class="alert alert-success alert-dismissible" role="alert">
		33	+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">
		34	+ <span aria-hidden="true">×</span>
		35	+ </button>
		36	+ <p>{{ message }}</p>
		37	+ </div>
		38	+ {% endfor %}
		39	+ {% endif %}
		40	+
30	<div class="row">	41	<div class="row">
31	<div class="col-lg-offset-4 col-lg-2">	42	<div class="col-lg-offset-4 col-lg-2">
32	<img src="" class="img-responsive center-block " alt="logo amadeus">	43	<img src="" class="img-responsive center-block " alt="logo amadeus">
	@@ -11,6 +11,6 @@ urlpatterns = [		@@ -11,6 +11,6 @@ urlpatterns = [
11	url(r'^profile/$', views.Profile.as_view(), name='profile'),	11	url(r'^profile/$', views.Profile.as_view(), name='profile'),
12	url(r'^profile/editar/(?P<username>[\w_-]+)/$', views.EditProfile.as_view(), name='edit_profile'),	12	url(r'^profile/editar/(?P<username>[\w_-]+)/$', views.EditProfile.as_view(), name='edit_profile'),
13	#	13	#
14	- url(r'^profile/update/$', views.UpdateUser.as_view(), name='update_profile'),	14	+ url(r'^profile/update/$', views.UpdateProfile.as_view(), name='update_profile'),
15	url(r'^profile/delete/$', views.DeleteUser.as_view(), name='delete_profile'),	15	url(r'^profile/delete/$', views.DeleteUser.as_view(), name='delete_profile'),
16	]	16	]