' + row.reply_message + ' -' + row.user.username + '
' + username = '' + try: + if row.user: + username = row.user.username + except Exception: + username = 'Unknown' + username_str = ' -' + username + '' if username else '' + replies += '' + row.reply_message + username_str + '
' if replies: replies = '.+)/$', training_feedback, name='training_feedback'),
- url(r'^feedback_view/(?P.+)/(?P.+)/$', view_training_feedback, name='view_training_feedback'),
- url(r'^workshops/academic_details/$', academic_details, name='academic_details'),
- url(r'^workshops/academic_details/(?P.+)/$', academic_details_state, name='academic_details_state'),
- url(r'^resource_center_map_details/(?P.+)/$', academic_details_state, name='academic_details_state'),
- url(r'^workshops/resource_center_details/$', view_college, name='view_college'),
- # url(r'^statistics/training/$', statistics_training', name='statistics_training'),
+ re_path(r'^workshops/college/view_college/(\d+)/$', view_college, name='view_college'),
+ re_path(r'^workshops/resource_center_view_college/(\d+)/$', view_college, name='view_college'),
+ re_path(r'^resource_center_view_college_map_details/(\d+)/$', view_college, name='view_college'),
+ # re_path(r'^software-training/academic-center/(\d+)/([a-zA-Z-]+)/$', view_college', name='view_college'),
+ re_path(r'^completed_workshops_list/(?P[\w-]+)/$', training_list, name='training_list'),
+ re_path(r'^view_completed_workshop/(\d+)/$', view_training, name='view_training'),
+ re_path(r'^feedback_list/(?P.+)/$', training_feedback, name='training_feedback'),
+ re_path(r'^feedback_view/(?P.+)/(?P.+)/$', view_training_feedback, name='view_training_feedback'),
+ re_path(r'^workshops/academic_details/$', academic_details, name='academic_details'),
+ re_path(r'^workshops/academic_details/(?P.+)/$', academic_details_state, name='academic_details_state'),
+ re_path(r'^resource_center_map_details/(?P.+)/$', academic_details_state, name='academic_details_state'),
+ re_path(r'^workshops/resource_center_details/$', view_college, name='view_college'),
+ # re_path(r'^statistics/training/$', statistics_training', name='statistics_training'),
# events urls
- url(r'^software-training/', include('events.urls', namespace='events')),
- url(r'^software-training/', include('events.urlsv2', namespace='eventsv2')),
-
- url(r'^participant/', include('mdldjango.urls', namespace='mdldjango')),
- url(r'^cdcontent/', include('cdcontent.urls', namespace='cdcontent')),
- url(r'^create_cd_content/', include('cdcontent.urls', namespace='cdcontent')),
- url(r'^statistics/', include('statistics.urls', namespace='statistics')),
- url(r'^list_videos/$', list_videos, name='list_videos'),
+ re_path(r'^software-training/', include(('events.urls', 'events'), namespace='events')),
+ re_path(r'^software-training/', include(('events.urlsv2', 'eventsv2'), namespace='eventsv2')),
+
+ re_path(r'^participant/', include(('mdldjango.urls', 'mdldjango'), namespace='mdldjango')),
+ re_path(r'^cdcontent/', include(('cdcontent.urls', 'cdcontent'), namespace='cdcontent')),
+ re_path(r'^create_cd_content/', include(('cdcontent.urls', 'cdcontent'), namespace='cdcontent')),
+ re_path(r'^statistics/', include(('statistics.urls', 'statistics'), namespace='statistics')),
+ re_path(r'^list_videos/$', list_videos, name='list_videos'),
+
# team
- url(r'^team/', include('team.urls')),
+ re_path(r'^team/', include('team.urls')),
#api
- url(r'^api/', include('api.urls', namespace='api')),
+ re_path(r'^api/', include(('api.urls', 'api'), namespace='api')),
#training
- url(r'^training/', include('training.urls', namespace='training')),
+ re_path(r'^training/', include(('training.urls', 'training'), namespace='training')),
# certificate
- url(r'^certificate/', include('certificate.urls', namespace='certificate')),
+ re_path(r'^certificate/', include(('certificate.urls', 'certificate'), namespace='certificate')),
- url(r'^creation/', include('creation.urls', namespace='creation')),
- url(r'^nicedit/', include('nicedit.urls')),
- # url(r'^migration/creation/', include('creationmigrate.urls', namespace='creationmigrate')),
- # url(r'^migration/events/', include('eventsmigration.urls', namespace='eventsmigration')),
- #url(r'^media/(?P.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT, 'show_indexes': False}),
+ re_path(r'^creation/', include(('creation.urls', 'creation'), namespace='creation')),
+ re_path(r'^nicedit/', include('nicedit.urls')),
+ # re_path(r'^migration/creation/', include('creationmigrate.urls', namespace='creationmigrate')),
+ # re_path(r'^migration/events/', include('eventsmigration.urls', namespace='eventsmigration')),
+ #re_path(r'^media/(?P.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT, 'show_indexes': False}),
# Old url adjustments
- # url(r'^list_videos/$', list_videos', name='list_videos'),
- url(r'^show_video/$', show_video, name='show_video'),
- url(r'^search/node/([0-9a-zA-Z-+%\(\)]+)/$', search_node, name='search_node'),
- url(r'^saveVideoData/$', saveVideoData, name='saveVideoData'),
+ # re_path(r'^list_videos/$', list_videos', name='list_videos'),
+ re_path(r'^show_video/$', show_video, name='show_video'),
+ re_path(r'^search/node/([0-9a-zA-Z-+%\(\)]+)/$', search_node, name='search_node'),
+ re_path(r'^saveVideoData/$', saveVideoData, name='saveVideoData'),
# Masquerade user
- # url(r'^masquerade/', include('masquerade.urls', namespace='masquerade')),
- url(r'^masquerade/', include('impersonate.urls', namespace='impersonate')),
+ # re_path(r'^masquerade/', include('masquerade.urls', namespace='masquerade')),
+ re_path(r'^masquerade/', include(('impersonate.urls', 'impersonate'), namespace='impersonate')),
# Cron links
- url(r'^cron/subtitle-files/create/$', create_subtitle_files, name='create_subtitle_files'),
+ re_path(r'^cron/subtitle-files/create/$', create_subtitle_files, name='create_subtitle_files'),
# reports
- url(r'^report_builder/', include('report_builder.urls')),
+ re_path(r'^report_builder/', include('report_builder.urls')),
# Youtube API V3
- url(r'^youtube/', include('youtube.urls', namespace='youtube')),
+ re_path(r'^youtube/', include(('youtube.urls', 'youtube'), namespace='youtube')),
# reports
- url(r'^reports/', include('reports.urls', namespace='reports')),
+ re_path(r'^reports/', include(('reports.urls', 'reports'), namespace='reports')),
# events2
- # url(r'^events2/', include('events2.urls', namespace='events2')),
- url(r'^cron/', include('cron.urls', namespace='cron')),
+ # re_path(r'^events2/', include('events2.urls', namespace='events2')),
+ re_path(r'^cron/', include(('cron.urls', 'cron'), namespace='cron')),
#donation
- url(r'^donate/', include('donate.urls', namespace='donate')),
+ re_path(r'^donate/', include(('donate.urls', 'donate'), namespace='donate')),
# cms
- url(r'^', include('cms.urls', namespace='cms')),
+ re_path(r'^', include(('cms.urls', 'cms'), namespace='cms')),
#nep book fiar
- url(r'wbf-book-fair-2023', bookfair,name="bookfair"),
+ re_path(r'wbf-book-fair-2023', bookfair,name="bookfair"),
] + static(settings.MEDIA_URL,document_root=settings.MEDIA_ROOT)
diff --git a/spoken/views.py b/spoken/views.py
index e99837086..56ea55b01 100644
--- a/spoken/views.py
+++ b/spoken/views.py
@@ -19,7 +19,7 @@
from django.shortcuts import render, get_object_or_404, redirect
from django.views.decorators.csrf import csrf_exempt
from django.template.context_processors import csrf
-from django.core.urlresolvers import reverse
+from django.urls import reverse
# Spoken Tutorial Stuff
from cms.forms import *
@@ -514,30 +514,32 @@ def testimonials_new_media(request, testimonial_type):
else:
form = MediaTestimonialForm(request.POST, request.FILES, on_home_page=1)
if form.is_valid():
- foss = FossCategory.objects.get(foss=request.POST.get('foss'))
+ foss = FossCategory.objects.get(foss=form.cleaned_data.get('foss'))
if not request.FILES:
- messages.error(request, 'Nothing uploaded. Choose a file for paste a link')
+ messages.error(request, 'Nothing uploaded. Choose a file or paste a link')
else:
file_container = request.FILES['media']
- # Put the uploaded file in the desired location.
- file_name = str(user) + '-' + dt.datetime.now().strftime("%Y-%m-%d-%H-%M-%S") + file_container.name[-4:]
- file_path = settings.MEDIA_ROOT + 'testimonials/' + str(foss.id) + '/'
- from_media_path = 'testimonials/' + str(foss.id) + '/' + file_name
- os.system("mkdir -p %s" % file_path)
- full_path = file_path + file_name
- fout = open(full_path, 'wb+')
- # Iterate through the chunks.
- for chunk in file_container.chunks():
- fout.write(chunk)
- fout.close()
+ file_ext = os.path.splitext(file_container.name)[1]
+ file_name = str(user.username) + '-' + dt.datetime.now().strftime("%Y-%m-%d-%H-%M-%S") + file_ext
+ file_path = os.path.join(settings.MEDIA_ROOT, 'testimonials', str(foss.id))
+ from_media_path = os.path.join('testimonials', str(foss.id), file_name)
+ os.makedirs(file_path, exist_ok=True)
+ full_path = os.path.join(file_path, file_name)
+ with open(full_path, 'wb+') as fout:
+ for chunk in file_container.chunks():
+ fout.write(chunk)
# Save in database
- data = MediaTestimonials(foss=foss, path=from_media_path, user=request.POST.get('name'),workshop_details=request.POST.get('workshop_details'), content= request.POST.get('content'))
- print(data)
- messages.success(request, 'Testimonial has posted successfully!')
+ data = MediaTestimonials(
+ foss=foss,
+ path=from_media_path,
+ user=form.cleaned_data.get('name'),
+ workshop_details=form.cleaned_data.get('workshop_details'),
+ content=form.cleaned_data.get('content')
+ )
data.save()
+ messages.success(request, 'Testimonial has posted successfully!')
return HttpResponseRedirect('/')
context['form'] = form
- context.update(csrf(request))
return render(request, 'spoken/templates/testimonial/mediaform.html', context)
@@ -555,13 +557,11 @@ def admin_testimonials_media_edit(request, rid):
else:
context['form'] = form
context['instance'] = testimonial
- context.update(csrf(request))
return render(request, 'spoken/templates/testimonial/mediaform.html', context)
form = MediaTestimonialEditForm(instance=testimonial)
context['form'] = form
context['instance'] = testimonial
- context.update(csrf(request))
return render(request, 'spoken/templates/testimonial/mediaform.html', context)
@@ -586,44 +586,27 @@ def testimonials_new(request):
rid = form_data.id
file_type = ['application/pdf']
if 'scan_copy' in request.FILES:
- if request.FILES['scan_copy'].content_type in file_type:
- file_path = settings.MEDIA_ROOT + 'testimonial/'
- try:
- os.mkdir(file_path)
- except Exception as e:
- print(e)
- file_path = settings.MEDIA_ROOT + 'testimonial/' + str(rid) + '/'
- try:
- os.mkdir(file_path)
- except Exception as e:
- print(e)
- full_path = file_path + str(rid) + ".pdf"
- fout = open(full_path, 'wb+')
- f = request.FILES['scan_copy']
- # Iterate through the chunks.
- for chunk in f.chunks():
- fout.write(chunk)
- fout.close()
+ uploaded_file = request.FILES['scan_copy']
+ if uploaded_file.content_type in file_type or uploaded_file.name.lower().endswith('.pdf'):
+ file_path = os.path.join(settings.MEDIA_ROOT, 'testimonial', str(rid))
+ os.makedirs(file_path, exist_ok=True)
+ full_path = os.path.join(file_path, str(rid) + ".pdf")
+ with open(full_path, 'wb+') as fout:
+ for chunk in uploaded_file.chunks():
+ fout.write(chunk)
messages.success(request, 'Testimonial has posted successfully!')
return HttpResponseRedirect('/')
context['form'] = form
- context.update(csrf(request))
return render(request, 'spoken/templates/testimonial/form.html', context)
def admin_testimonials_edit(request, rid):
user = request.user
context = {}
- form = TestimonialsForm()
- instance = ''
if not user.has_perm('events.change_testimonials'):
raise PermissionDenied()
- try:
- instance = Testimonials.objects.get(pk=rid)
- except Exception as e:
- raise Http404('Page not found')
- print(e)
+ instance = get_object_or_404(Testimonials, pk=rid)
if request.method == 'POST':
form = TestimonialsForm(request.POST, request.FILES, instance=instance)
@@ -631,29 +614,17 @@ def admin_testimonials_edit(request, rid):
form_data = form.save(commit=False)
form_data.user_id = user.id
form_data.save()
- file_type = ['application/pdf','image/jpeg','image/png']
+ file_type = ['application/pdf', 'image/jpeg', 'image/png']
if 'scan_copy' in request.FILES:
- if request.FILES['scan_copy'].content_type in file_type:
- file_path = settings.MEDIA_ROOT + 'testimonial/'
- try:
- os.mkdir(file_path)
- except Exception as e:
- print(e)
- file_path = settings.MEDIA_ROOT + 'testimonial/' + str(rid) + '/'
- try:
- os.mkdir(file_path)
- except Exception as e:
- print(e)
- f = request.FILES['scan_copy']
- filename = str(f)
- ext = os.path.splitext(filename)[1].lower()
- full_path = file_path + str(rid) + ext
- fout = open(full_path, 'wb+')
-
- # Iterate through the chunks.
- for chunk in f.chunks():
- fout.write(chunk)
- fout.close()
+ uploaded_file = request.FILES['scan_copy']
+ ext = os.path.splitext(uploaded_file.name)[1].lower()
+ if uploaded_file.content_type in file_type or ext in ['.pdf', '.jpg', '.jpeg', '.png']:
+ file_path = os.path.join(settings.MEDIA_ROOT, 'testimonial', str(rid))
+ os.makedirs(file_path, exist_ok=True)
+ full_path = os.path.join(file_path, str(rid) + ext)
+ with open(full_path, 'wb+') as fout:
+ for chunk in uploaded_file.chunks():
+ fout.write(chunk)
messages.success(request, 'Testimonial updated successfully!')
return HttpResponseRedirect('/')
@@ -661,49 +632,34 @@ def admin_testimonials_edit(request, rid):
form = TestimonialsForm(instance=instance)
context['form'] = form
context['instance'] = instance
- context.update(csrf(request))
return render(request, 'spoken/templates/testimonial/form.html', context)
def admin_testimonials_delete(request, rid):
user = request.user
context = {}
- instance = ''
if not user.has_perm('events.delete_testimonials'):
raise PermissionDenied()
- try:
- instance = Testimonials.objects.get(pk=rid)
- except Exception as e:
- raise Http404('Page not found')
- print(e)
+ instance = get_object_or_404(Testimonials, pk=rid)
if request.method == 'POST':
- instance = Testimonials.objects.get(pk=rid)
instance.delete()
messages.success(request, 'Testimonial deleted successfully')
return HttpResponseRedirect(reverse('admin_testimonials'))
context['instance'] = instance
- context.update(csrf(request))
return render(request, 'spoken/templates/testimonial/form.html', context)
def admin_testimonials_media_delete(request, rid):
user = request.user
context = {}
- instance = ''
if not user.has_perm('events.delete_testimonials'):
raise PermissionDenied()
- try:
- instance = MediaTestimonials.objects.get(pk=rid)
- except Exception as error:
- print(error)
- raise Http404('Page not found')
+ instance = get_object_or_404(MediaTestimonials, pk=rid)
if request.method == 'POST':
- instance = MediaTestimonials.objects.get(pk=rid)
instance.delete()
messages.success(request, 'Testimonial deleted successfully')
return HttpResponseRedirect(reverse('admin_testimonials'))
context['instance'] = instance
- context.update(csrf(request))
return render(request, 'spoken/templates/testimonial/mediaform.html', context)
@@ -721,7 +677,6 @@ def admin_testimonials(request):
context['collection'] = collection
context['mediacollection'] = mediacollection
context['media_url'] = settings.MEDIA_URL
- context.update(csrf(request))
return render(request, 'spoken/templates/testimonial/index.html', context)
@@ -923,7 +878,7 @@ def saveVideoData(request):
"mongodb://"+MONGO_USER+':'+MONGO_PASS+'@'+MONGO_HOST+':'+MONGO_PORT+\
'/?authSource='+MONGO_DB)
mydb = myclient[MONGO_DB]
- if request.user.is_authenticated():
+ if request.user.is_authenticated:
d = request.POST
name = request.user.username
if not name:
diff --git a/static/admin/auth/user/change_password.html b/static/admin/auth/user/change_password.html
index 2a1b4d3c9..58b136c5f 100644
--- a/static/admin/auth/user/change_password.html
+++ b/static/admin/auth/user/change_password.html
@@ -1,5 +1,5 @@
{% extends "admin/base_site.html" %}
-{% load i18n admin_static %}
+{% load i18n static %}
{% load admin_urls %}
{% block extrahead %}{{ block.super }}
diff --git a/static/admin/base.html b/static/admin/base.html
index 140d39668..ee07873cc 100644
--- a/static/admin/base.html
+++ b/static/admin/base.html
@@ -1,4 +1,4 @@
-{% load admin_static %}
+{% load static %}
{% block title %}{% endblock %}
diff --git a/static/admin/change_form.html b/static/admin/change_form.html
index d4935ed78..77b1d9a12 100644
--- a/static/admin/change_form.html
+++ b/static/admin/change_form.html
@@ -1,5 +1,5 @@
{% extends "admin/base_site.html" %}
-{% load i18n admin_urls admin_static admin_modify %}
+{% load i18n admin_urls static admin_modify %}
{% block extrahead %}{{ block.super }}
diff --git a/static/admin/change_list.html b/static/admin/change_list.html
index 15583d1a8..d6f610028 100644
--- a/static/admin/change_list.html
+++ b/static/admin/change_list.html
@@ -1,5 +1,5 @@
{% extends "admin/base_site.html" %}
-{% load i18n admin_urls admin_static admin_list %}
+{% load i18n admin_urls static admin_list %}
{% block extrastyle %}
{{ block.super }}
diff --git a/static/admin/change_list_results.html b/static/admin/change_list_results.html
index 419cf1e46..b22ddb840 100644
--- a/static/admin/change_list_results.html
+++ b/static/admin/change_list_results.html
@@ -1,4 +1,4 @@
-{% load i18n admin_static %}
+{% load i18n static %}
{% if result_hidden_fields %}
{# DIV for HTML validation #}
{% for item in result_hidden_fields %}{{ item }}{% endfor %}
diff --git a/static/admin/edit_inline/stacked.html b/static/admin/edit_inline/stacked.html
index 32917756b..f93ea0f97 100644
--- a/static/admin/edit_inline/stacked.html
+++ b/static/admin/edit_inline/stacked.html
@@ -1,4 +1,4 @@
-{% load i18n admin_static %}
+{% load i18n static %}
{{ inline_admin_formset.opts.verbose_name_plural|title }}
{{ inline_admin_formset.formset.management_form }}
diff --git a/static/admin/edit_inline/tabular.html b/static/admin/edit_inline/tabular.html
index 131fdb320..43dfd409b 100644
--- a/static/admin/edit_inline/tabular.html
+++ b/static/admin/edit_inline/tabular.html
@@ -1,4 +1,4 @@
-{% load i18n admin_static admin_modify %}
+{% load i18n static admin_modify %}