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

fbormann
2 parents 495dbd8a 6f3a606b
Showing 7 changed files with 71 additions and 48 deletions Show diff stats
.gitignore
amadeus/settings.py
mural/forms.py
mural/templates/mural/_form.html
pdf_file/forms.py
requirements.txt
users/forms.py
@@ -51,5 +51,6 @@ coverage.xml
 angular_api
 logs/
 amadeus/uploads/
+data/
 links/static/images/
 uploads/
@@ -56,6 +56,7 @@ INSTALLED_APPS = [
     'django_crontab',
     'django_cron',
     'channels',
+    'resubmit', # Utilizado para salvar arquivos na cache, para caso o formulario não seja preenchido corretamente o usuário não precise fazer o upload outra vez dos arquivos
     'amadeus',
     'users',
@@ -120,6 +121,17 @@ TEMPLATES = [
     },
 ]
+
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+    },
+    "resubmit": {
+        'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
+        "LOCATION": os.path.join(BASE_DIR, 'data/cache/resubmit'),
+    },
+}
+
 WSGI_APPLICATION = 'amadeus.wsgi.application'
 SESSION_SECURITY_WARN_AFTER = 1140
@@ -357,11 +369,11 @@ SUMMERNOTE_CONFIG = {
     # Set `upload_to` function for attachments.
     #'attachment_upload_to': my_custom_upload_to_func(),
-    
+
 }
 try:
     from .local_settings import *
 except ImportError:
-    pass
 \ No newline at end of file
+    pass
@@ -4,6 +4,8 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.html import strip_tags
 from django.db.models import Q
+from resubmit.widgets import ResubmitFileWidget
+
 from topics.models import Resource
 from .models import GeneralPost, CategoryPost, SubjectPost, Comment
@@ -14,7 +16,7 @@ class Validation(forms.ModelForm):
 	def clean_post(self):
 		post = self.cleaned_data.get('post', '')
 		cleaned_post = strip_tags(post)
-		
+
 		if cleaned_post == '':
 			self._errors['post'] = [_('This field is required.')]
@@ -34,13 +36,15 @@ class Validation(forms.ModelForm):
 		return image
+
 class GeneralPostForm(Validation):
 	class Meta:
 		model = GeneralPost
 		fields = ['action', 'post', 'image']
 		widgets = {
 			'action': forms.RadioSelect,
-			'post': forms.Textarea
+			'post': forms.Textarea,
+			'image': ResubmitFileWidget(attrs={'accept':'image/*'}),
 		}
 class CategoryPostForm(Validation):
@@ -49,7 +53,8 @@ class CategoryPostForm(Validation):
 		fields = ['action', 'post', 'image']
 		widgets = {
 			'action': forms.RadioSelect,
-			'post': forms.Textarea
+			'post': forms.Textarea,
+			'image': ResubmitFileWidget(attrs={'accept':'image/*'}),
 		}
 class SubjectPostForm(Validation):
@@ -60,7 +65,7 @@ class SubjectPostForm(Validation):
 		subject = kwargs['initial'].get('subject', None)
 		if not kwargs['instance'] is None:
-			subject = self.instance.space	
+			subject = self.instance.space
 		if user.is_staff:
 			self.fields['resource'].choices = [(r.id, str(r)) for r in Resource.objects.filter(Q(topic__subject = subject))]
@@ -74,7 +79,8 @@ class SubjectPostForm(Validation):
 		fields = ['action', 'resource', 'post', 'image']
 		widgets = {
 			'action': forms.RadioSelect,
-			'post': forms.Textarea
+			'post': forms.Textarea,
+			'image': ResubmitFileWidget(attrs={'accept':'image/*'}),
 		}
 class ResourcePostForm(Validation):
@@ -83,7 +89,8 @@ class ResourcePostForm(Validation):
 		fields = ['action', 'post', 'image']
 		widgets = {
 			'action': forms.RadioSelect,
-			'post': forms.Textarea
+			'post': forms.Textarea,
+			'image': ResubmitFileWidget(attrs={'accept':'image/*'}),
 		}
 class CommentForm(forms.ModelForm):
@@ -92,7 +99,7 @@ class CommentForm(forms.ModelForm):
 	def clean_comment(self):
 		comment = self.cleaned_data.get('comment', '')
 		cleaned_comment = strip_tags(comment)
-		
+
 		if cleaned_comment == '':
 			self._errors['comment'] = [_('This field is required.')]
@@ -114,4 +121,7 @@ class CommentForm(forms.ModelForm):
 	class Meta:
 		model = Comment
-		fields = ['comment', 'image']
 \ No newline at end of file
+		fields = ['comment', 'image']
+		widgets = {
+			'image': ResubmitFileWidget(attrs={'accept':'image/*'}),
+		}
@@ -33,7 +33,7 @@
 						{% render_field form.resource class='form-control' %}
 						<span id="helpBlock" class="help-block">{{ form.resource.help_text }}</span>
-							
+
 						{% if form.resource.errors %}
 							<div class="alert alert-danger alert-dismissible" role="alert">
 									<button type="button" class="close" data-dismiss="alert" aria-label="Close">
@@ -54,7 +54,7 @@
 					{% render_field form.post class='form-control text_simple_wysiwyg' %}
 					<span id="helpBlock" class="help-block">{{ form.post.help_text }}</span>
-						
+
 					{% if form.post.errors %}
 						<div class="alert alert-danger alert-dismissible" role="alert">
 								<button type="button" class="close" data-dismiss="alert" aria-label="Close">
@@ -71,24 +71,15 @@
 				<div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput">
 					{% render_field form.image %}
-					
-					<div class="input-group common-file-input">
-				      	<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>
 				    <div class="filedrag">
 			    		{% trans 'Click or drop the file here' %}<br />
-			      		
+
 			      		<small>{% trans 'The file could not exceed 5MB.' %}</small>
 			  		</div>
 					<span id="helpBlock" class="help-block">{{ form.image.help_text }}</span>
-						
+
 					{% if form.image.errors %}
 						<div class="alert alert-danger alert-dismissible" role="alert">
 								<button type="button" class="close" data-dismiss="alert" aria-label="Close">
@@ -137,7 +128,7 @@
 		var small = $("#id_image"),
 			filedrag = $(".filedrag"),
 			common = $(".common-file-input");
-			
+
 		// file select
 		small.on("change", FileSelectHandler);
@@ -3,6 +3,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.html import strip_tags
 from subjects.models import Tag
+from resubmit.widgets import ResubmitFileWidget
 from .models import PDFFile
@@ -17,7 +18,7 @@ class PDFFileForm(forms.ModelForm):
         if self.instance.id:
             self.subject = self.instance.topic.subject
             self.initial['tags'] = ", ".join(self.instance.tags.all().values_list("name", flat = True))
-        
+
         self.fields['students'].queryset = self.subject.students.all()
         self.fields['groups'].queryset = self.subject.group_subject.all()
@@ -32,11 +33,12 @@ class PDFFileForm(forms.ModelForm):
             'brief_description': forms.Textarea,
             'students': forms.SelectMultiple,
             'groups': forms.SelectMultiple,
+            'file': ResubmitFileWidget(attrs={'accept':'application/pdf, application/x-pdf, application/x-bzpdf, application/x-gzpdf'}),
         }
     def clean_name(self):
         name = self.cleaned_data.get('name', '')
-        
+
         topics = self.subject.topic_subject.all()
         for topic in topics:
@@ -44,7 +46,7 @@ class PDFFileForm(forms.ModelForm):
                 same_name = topic.resource_topic.filter(name__unaccent__iexact = name).exclude(id = self.instance.id).count()
             else:
                 same_name = topic.resource_topic.filter(name__unaccent__iexact = name).count()
-        
+
             if same_name > 0:
                 self._errors['name'] = [_('This subject already has a pdf file with this name')]
@@ -54,14 +56,14 @@ class PDFFileForm(forms.ModelForm):
     def clean_file(self):
         file = self.cleaned_data.get('file', False)
-        
+
         if file:
             if hasattr(file, '_size'):
                 if file._size > self.MAX_UPLOAD_SIZE:
                     self._errors['file'] = [_("The file is too large. It should have less than 10MB.")]
                     return ValueError
-        
+
         elif not self.instance.pk:
             self._errors['file'] = [_('This field is required.')]
@@ -82,7 +84,7 @@ class PDFFileForm(forms.ModelForm):
         for prev in previous_tags:
             if not prev.name in tags:
                 self.instance.tags.remove(prev)
-        
+
         for tag in tags:
             tag = tag.strip()
@@ -96,4 +98,4 @@ class PDFFileForm(forms.ModelForm):
             if not new_tag in self.instance.tags.all():
                 self.instance.tags.add(new_tag)
-        return self.instance
 \ No newline at end of file
+        return self.instance
@@ -37,4 +37,5 @@ django-cron==0.5.0
 django-crontab==0.7.1
 python-dateutil==2.6.0
 channels==1.0.3
-asgi_redis==1.0.0
 \ No newline at end of file
+asgi_redis==1.0.0
+file-resubmit==0.1.0
@@ -5,6 +5,9 @@ from rolepermissions.shortcuts import assign_role
 from django.contrib.auth import update_session_auth_hash
 from django.core.validators import validate_email
 from django.core.exceptions import ValidationError
+
+from resubmit.widgets import ResubmitFileWidget
+
 from .models import User
 class Validation(forms.ModelForm):
@@ -19,7 +22,7 @@ class Validation(forms.ModelForm):
 			return email
 		except ValidationError:
 			self._errors['email'] = [_('You must insert an email address')]
-			
+
 			return ValueError
 	def clean_image(self):
@@ -37,13 +40,13 @@ class Validation(forms.ModelForm):
 	def clean_password2(self):
 		password = self.cleaned_data.get("new_password")
 		password2 = self.cleaned_data.get("password2")
-		
+
 		if password and password2 and password != password2:
 			self._errors['password2'] = [_('The confirmation password is incorrect.')]
 			return ValueError
-        
-		return password2	
+
+		return password2
 class RegisterUserForm(Validation):
     new_password = forms.CharField(label=_('Password'), widget = forms.PasswordInput(render_value = True, attrs = {'placeholder': _('Password') + ' *'}))
@@ -53,11 +56,11 @@ class RegisterUserForm(Validation):
     def save(self, commit=True):
         super(RegisterUserForm, self).save(commit=False)
-        
+
         self.instance.set_password(self.cleaned_data['new_password'])
         self.instance.save()
-        
+
         return self.instance
     class Meta:
@@ -68,6 +71,7 @@ class RegisterUserForm(Validation):
         	'username': forms.TextInput(attrs = {'placeholder': _('Name') + ' *'}),
         	'last_name': forms.TextInput(attrs = {'placeholder': _('Last Name') + ' *'}),
         	'social_name': forms.TextInput(attrs = {'placeholder': _('Social Name')}),
+			'image': ResubmitFileWidget(attrs={'accept':'image/*'}),
         }
 class ProfileForm(Validation):
@@ -75,9 +79,9 @@ class ProfileForm(Validation):
 	def save(self, commit=True):
 		super(ProfileForm, self).save(commit=False)
-        
+
 		self.instance.save()
-        
+
 		return self.instance
 	class Meta:
@@ -86,7 +90,8 @@ class ProfileForm(Validation):
 		widgets = {
 			'description': forms.Textarea,
 			'username': forms.TextInput(attrs = {'readonly': 'readonly'}),
-			'last_name': forms.TextInput(attrs = {'readonly': 'readonly'})
+			'last_name': forms.TextInput(attrs = {'readonly': 'readonly'}),
+			'image': ResubmitFileWidget(attrs={'accept':'image/*'}),
 		}
 class UserForm(Validation):
@@ -98,19 +103,19 @@ class UserForm(Validation):
 		super(UserForm, self).__init__(*args, **kwargs)
 		self.is_edit = is_update
-		    
+
 	new_password = forms.CharField(label = _('Password'), widget = forms.PasswordInput(render_value = True), required = False)
 	password2 = forms.CharField(label = _('Confirm Password'), widget = forms.PasswordInput(render_value = True), required = False)
 	def save(self, commit=True):
 		super(UserForm, self).save(commit=False)
-        
+
 		if not self.is_edit or self.cleaned_data['new_password'] != '':
 			self.instance.set_password(self.cleaned_data['new_password'])
 		self.instance.save()
-        
+
 		return self.instance
 	class Meta:
@@ -118,6 +123,7 @@ class UserForm(Validation):
 		fields = ['email', 'username', 'last_name', 'social_name', 'description', 'show_email', 'image', 'is_staff', 'is_active',]
 		widgets = {
 			'description': forms.Textarea,
+			'image': ResubmitFileWidget(attrs={'accept':'image/*'}),
 		}
 class ChangePassForm(Validation):
@@ -143,13 +149,13 @@ class ChangePassForm(Validation):
 	def save(self, commit=True):
 		super(ChangePassForm, self).save(commit=False)
-        
+
 		self.instance.set_password(self.cleaned_data['new_password'])
 		update_session_auth_hash(self.request, self.instance)
 		self.instance.save()
-        
+
 		return self.instance
 	class Meta:
@@ -173,7 +179,7 @@ class PassResetRequest(forms.Form):
 			return email
 		except ValidationError:
 			self._errors['email'] = [_('You must insert a valid email address')]
-			
+
 			return ValueError
 class SetPasswordForm(Validation):
@@ -184,4 +190,4 @@ class SetPasswordForm(Validation):
 	class Meta:
 		model = User
-		fields = []
 \ No newline at end of file
+		fields = []
	@@ -51,5 +51,6 @@ coverage.xml		@@ -51,5 +51,6 @@ coverage.xml
51	angular_api	51	angular_api
52	logs/	52	logs/
53	amadeus/uploads/	53	amadeus/uploads/
		54	+data/
54	links/static/images/	55	links/static/images/
55	uploads/	56	uploads/