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

fbormann
2 parents 8d82a1f9 5214a1f2
Showing 5 changed files with 32 additions and 30 deletions Show diff stats
amadeus/settings.py
topics/forms.py
topics/templates/resources/list.html
topics/views.py
users/views.py
@@ -242,8 +242,8 @@ LOGS_URL = &#39;logs/&#39;
 # E-mail
-EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-DEFAULT_FROM_EMAIL = 'admin@amadeus.com.br'
+# EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
+# DEFAULT_FROM_EMAIL = 'admin@amadeus.com.br'
 # Messages
 from django.contrib.messages import constants as messages_constants
@@ -256,9 +256,10 @@ MESSAGE_TAGS = {
 }
 #Send email for forgot Password
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_USE_TLS = True
-DEFAULT_FROM_EMAIL = 'test@gmail.com'
-SERVER_EMAIL = 'test@gmail.com'
+DEFAULT_FROM_EMAIL = 'amadeusteste@gmail.com'
+# SERVER_EMAIL = 'amadeusteste@gmail.com'
 EMAIL_HOST = 'smtp.gmail.com'
 EMAIL_PORT = 587
 EMAIL_HOST_USER = 'amadeusteste@gmail.com'
@@ -17,12 +17,12 @@ class TopicForm(forms.ModelForm):
 	def clean_name(self):
 		name = self.cleaned_data.get('name', '')
 		repo = self.cleaned_data.get('repository', False)
-		
+
 		if self.instance.id:
 			same_name = self.subject.topic_subject.filter(name__unaccent__iexact = name).exclude(id = self.instance.id).count()
 		else:
 			same_name = self.subject.topic_subject.filter(name__unaccent__iexact = name).count()
-		
+
 		if same_name > 0:
 			if repo:
 				self._errors['name'] = [_('This subject already has a repository')]
@@ -38,4 +38,4 @@ class TopicForm(forms.ModelForm):
 		fields = ['repository', 'name', 'description', 'visible' ]
 		widgets = {
 			'description': forms.Textarea,
-		}
 \ No newline at end of file
+		}
@@ -3,15 +3,15 @@
 {% subject_permissions request.user topic.subject as has_subject_permissions %}
-<div id="resource_{{ topic.slug }}" class="list-group resource_list">
+<div id="resource_{{ topic.slug }}_topic" class="list-group resource_list">
 	{% for resource in topic.resource_topic.all %}
 		{% resource_permissions request.user resource as has_resource_permissions %}
-		
+
 		{% if has_resource_permissions %}
 	  		<div class="list-group-item {% if not resource.visible %}disabled{% endif %}">
-	  			<input type="hidden" class="id_inp" name="id" value="{{ resource.id }}" />
-		    	<input type="hidden" class="order_inp" name="order" value="{{ resource.order }}" />
-		    	<input type="hidden" class="url_order" value="{% url 'topics:update_resource_order' %}" />
+	  			<input type="hidden" class="id_inp_resource" name="id" value="{{ resource.id }}" />
+		    	<input type="hidden" class="order_inp_resource" name="order" value="{{ resource.order }}" />
+		    	<input type="hidden" class="url_order_resource" value="{% url 'topics:update_resource_order' %}" />
 	  			<h4 class="pull-left list-group-item-heading">
 	  				<a data-href="{{ resource.access_link }}" class="resource_link" {% if resource.show_window %}target="_blank"{% endif %}>
@@ -50,7 +50,7 @@
 	    $('.modal').remove();
 	    $.get(url, function (modal) {
-	        $("#resource_{{ topic.slug }}").parent().after(modal);
+	        $("#resource_{{ topic.slug }}_topic").parent().after(modal);
 	        $('.modal').modal('show');
 	    });
@@ -62,7 +62,7 @@
 			btn = $(this).find('button.btn_menu').is(e.target),
 			del = $(this).find('a.delete').is(e.target),
 			upd = $(this).find('a.edit').is(e.target);
-		
+
 		if (!arrow && !menu && !del && !upd && !btn) {
 			var link = $(this).find('.resource_link').data('href'),
 				target = $(this).find('.resource_link').attr('target');
@@ -75,19 +75,19 @@
 		}
 	});
-	$("#resource_{{ topic.slug }}").sortable({ 
+	$("#resource_{{ topic.slug }}_topic").sortable({
 	    delay: 100,
 	    distance: 5,
 	    handle: 'i.fa-arrows',
 	    update: function( event, ui ) {
 	  		var cont = 1;
 	  		var data = [];
-	  		
-	  		$("#resource_{{ topic.slug }}").find('.order_inp').each(function () {
+
+	  		$("#resource_{{ topic.slug }}_topic").find('.order_inp_resource').each(function () {
 	  			$(this).val(cont++);
 	  			data.push({
-	  				'resource_id': $(this).parent().find('.id_inp').val(),
+	  				'resource_id': $(this).parent().find('.id_inp_resource').val(),
 	  				'resource_order': $(this).val()
 	  			});
 	  		});
@@ -100,15 +100,15 @@
 	function sendUpdateResource(data) {
 		$.ajax({
-			url: $("#resource_{{ topic.slug }}").find('.url_order').val(),
+			url: $('.url_order_resource').val(),
 			dataType: 'json',
 			data: {'data': data},
 			success: function(response) {
 				console.log(response);
 			},
 			error: function(response) {
-				console.log(response);	
+				console.log(response);
 			}
 		});
 	}
-</script>
 \ No newline at end of file
+</script>
@@ -47,7 +47,7 @@ class CreateView(LoginRequiredMixin, LogMixin, generic.edit.CreateView):
 		slug = self.kwargs.get('slug', '')
 		initial['subject'] = get_object_or_404(Subject, slug = slug)
-		
+
 		return initial
 	def form_valid(self, form):
@@ -57,6 +57,7 @@ class CreateView(LoginRequiredMixin, LogMixin, generic.edit.CreateView):
 		subject = get_object_or_404(Subject, slug = slug)
 		self.object.subject = subject
+		print (subject.topic_subject.count())
 		self.object.order = subject.topic_subject.count() + 1
 		self.object.save()
@@ -125,7 +126,7 @@ class UpdateView(LoginRequiredMixin, LogMixin, generic.UpdateView):
 		slug = self.kwargs.get('sub_slug', '')
 		initial['subject'] = get_object_or_404(Subject, slug = slug)
-		
+
 		return initial
 	def get_context_data(self, **kwargs):
@@ -263,7 +264,7 @@ def update_resource_order(request):
 	if not data is None:
 		data = json.loads(data)
-
+		
 		for t_data in data:
 			resource = get_object_or_404(Resource, id = t_data['resource_id'])
 			resource.order = t_data['resource_order']
@@ -276,7 +277,7 @@ def update_resource_order(request):
 def getResourceCount(request):
 	resources = Resource.objects.distinct()
-	
+
 	data = {}
 	for resource in resources:
 		key = resource.__dict__['_my_subclass']
@@ -284,8 +285,8 @@ def getResourceCount(request):
 			data[key] = data[key] + 1
 		else:
 			data[key] = 1
-	
-	real_data = []	
+
+	real_data = []
 	for item in data.items():
 		real_data.append(item)
 	return JsonResponse(real_data, safe=False)
@@ -412,7 +412,7 @@ class ForgotPassword(generic.FormView):
 					subject = ''.join(subject.splitlines())
 					email = loader.render_to_string(email_template_name, c)
-					mailsender = MailSender.objects.get(id = 1)
+					mailsender = MailSender.objects.latest('id')
 					if mailsender.hostname == "example.com":
 						send_mail(subject, email, settings.DEFAULT_FROM_EMAIL , [user.email], fail_silently=False)
@@ -424,10 +424,10 @@ class ForgotPassword(generic.FormView):
 						backend = EmailBackend(
 									host = mailsender.hostname, port = mailsender.port, username = mailsender.username,
-									password = mailsender.password, use_tls = tls, fail_silently = False
+									password = mailsender.password, use_tls = tls
 								)
-						mail_msg = EmailMessage(subject = subject, body = email, from_email = settings.DEFAULT_FROM_EMAIL, to = [user.email], connection = backend)
+						mail_msg = EmailMessage(subject = subject, body = email, to = [user.email], connection = backend)
 						mail_msg.send()
	@@ -412,7 +412,7 @@ class ForgotPassword(generic.FormView):		@@ -412,7 +412,7 @@ class ForgotPassword(generic.FormView):
412	subject = ''.join(subject.splitlines())	412	subject = ''.join(subject.splitlines())
413	email = loader.render_to_string(email_template_name, c)	413	email = loader.render_to_string(email_template_name, c)
414		414
415	- mailsender = MailSender.objects.get(id = 1)	415	+ mailsender = MailSender.objects.latest('id')
416		416
417	if mailsender.hostname == "example.com":	417	if mailsender.hostname == "example.com":
418	send_mail(subject, email, settings.DEFAULT_FROM_EMAIL , [user.email], fail_silently=False)	418	send_mail(subject, email, settings.DEFAULT_FROM_EMAIL , [user.email], fail_silently=False)
	@@ -424,10 +424,10 @@ class ForgotPassword(generic.FormView):		@@ -424,10 +424,10 @@ class ForgotPassword(generic.FormView):
424		424
425	backend = EmailBackend(	425	backend = EmailBackend(
426	host = mailsender.hostname, port = mailsender.port, username = mailsender.username,	426	host = mailsender.hostname, port = mailsender.port, username = mailsender.username,
427	- password = mailsender.password, use_tls = tls, fail_silently = False	427	+ password = mailsender.password, use_tls = tls
428	)	428	)
429		429
430	- mail_msg = EmailMessage(subject = subject, body = email, from_email = settings.DEFAULT_FROM_EMAIL, to = [user.email], connection = backend)	430	+ mail_msg = EmailMessage(subject = subject, body = email, to = [user.email], connection = backend)
431		431
432	mail_msg.send()	432	mail_msg.send()
433		433