diff options
Diffstat (limited to 'website')
| -rwxr-xr-x | website/forms.py | 11 | ||||
| -rwxr-xr-x | website/models.py | 1 | ||||
| -rwxr-xr-x | website/templates/abstract-details.html | 2 | ||||
| -rwxr-xr-x | website/templates/comment-abstract.html | 2 | ||||
| -rwxr-xr-x | website/views.py | 11 |
5 files changed, 11 insertions, 16 deletions
diff --git a/website/forms.py b/website/forms.py index 392d6e2..fdf6bc2 100755 --- a/website/forms.py +++ b/website/forms.py @@ -111,11 +111,6 @@ class ProposalForm(forms.ModelForm): raise forms.ValidationError('File size exceeds 5MB') return attachment - # def clean_abstract(self): - # about_me = self.cleaned_data['abstract'] - # if len(about_me) < 300: - # raise forms.ValidationError("Abstract me should contain min. 300 characteres") - class WorkshopForm(forms.ModelForm): about_me = forms.CharField(widget=forms.Textarea(attrs={'class': 'form-control', 'placeholder': 'About Me'}), @@ -150,12 +145,6 @@ class WorkshopForm(forms.ModelForm): model = Proposal exclude = ('user', 'email','status','rate') - def clean_title(self): - title = self.cleaned_data['title'] - if Proposal.objects.filter(title=title).exists(): - raise forms.ValidationError("This title already exist.") - return title - def clean_attachment(self): import os cleaned_data = self.cleaned_data diff --git a/website/models.py b/website/models.py index a7ef959..c3b2709 100755 --- a/website/models.py +++ b/website/models.py @@ -7,6 +7,7 @@ from scipy2016 import settings def get_document_dir(instance, filename): # ename, eext = instance.user.email.split("@") fname, fext = filename.split(".") + print "----------------->",instance.user return '%s/attachment/%s/%s.%s' % (instance.user, instance.proposal_type, fname+'_'+str(instance.user), fext) class Proposal(models.Model): diff --git a/website/templates/abstract-details.html b/website/templates/abstract-details.html index 6dae590..22c1d56 100755 --- a/website/templates/abstract-details.html +++ b/website/templates/abstract-details.html @@ -58,7 +58,7 @@ <p><b>Date Created: </b> {{ proposal.date_created }}</p> {% if proposal.attachment.url %} <p><b>Attachment: </b> - <a href="{{ proposal.attachment.url }}" class="btn btn-info" target="_blank">{{filename}}</a></p> + <a href="{{ url }}" class="btn btn-info" target="_blank">{{filename}}</a></p> {% endif %} <p><b>Comments: </b> <hr> diff --git a/website/templates/comment-abstract.html b/website/templates/comment-abstract.html index eb540f7..8475e72 100755 --- a/website/templates/comment-abstract.html +++ b/website/templates/comment-abstract.html @@ -61,7 +61,7 @@ <p><b>Prerequisite: </b> {{ proposal.prerequisite }}</p> {% endif%} {% if proposal.attachment.url %} - <b>Attachment: </b> <a href="{{ proposal.attachment.url }}" class="btn btn-info" target="_blank">{{ filename }}</a> + <b>Attachment: </b> <a href="{{ url }}" class="btn btn-info" target="_blank">{{ filename }}</a> {% endif %} <p><b>Date Created: </b> {{ proposal.date_created }}</p> diff --git a/website/views.py b/website/views.py index 5ce2666..cf30a5e 100755 --- a/website/views.py +++ b/website/views.py @@ -308,17 +308,19 @@ def abstract_details(request, proposal_id=None): return render(request, 'abstract_details.html', context) elif user is not None: proposal = Proposal.objects.get(id=proposal_id) + url = '/2016'+str(proposal.attachment.url) comments = Comments.objects.filter(proposal=proposal) context['proposal'] = proposal context['user'] = user + context['url'] = url context['comments'] = comments path, filename = os.path.split(str(proposal.attachment)) context['filename'] = filename return render(request, 'abstract-details.html', context) - else: - return render(request, 'cfp.html') else: - return render(request, 'cfp.html') + form = UserLoginForm() + context['form'] = form + return render(request, 'cfp.html', context) def rate_proposal(request, proposal_id = None): user = request.user @@ -363,6 +365,7 @@ def comment_abstract(request, proposal_id = None): context = {} if user.is_authenticated(): proposal = Proposal.objects.get(id=proposal_id) + url = '/2016'+str(proposal.attachment.url) if request.method == 'POST': comment = Comments() comment.comment = request.POST['comment'] @@ -412,6 +415,7 @@ def comment_abstract(request, proposal_id = None): context['rates'] = rates context['proposal'] = proposal context['comments'] = comments + context['url'] = url path, filename = os.path.split(str(proposal.attachment)) context['filename'] = filename context.update(csrf(request)) @@ -421,6 +425,7 @@ def comment_abstract(request, proposal_id = None): rates = Ratings.objects.filter(proposal=proposal) context['rates'] = rates context['proposal'] = proposal + context['url'] = url context['comments'] = comments path, filename = os.path.split(str(proposal.attachment)) context['filename'] = filename |