@@ -85,4 +81,4 @@

-{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/fileupload/urls.py b/fileupload/urls.py index 790ed22..b406020 100644 --- a/fileupload/urls.py +++ b/fileupload/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, url +from django.conf.urls.defaults import patterns, url from fileupload.views import PictureCreateView, PictureDeleteView urlpatterns = patterns('', diff --git a/fileupload/views.py b/fileupload/views.py index bebdde7..1291b20 100644 --- a/fileupload/views.py +++ b/fileupload/views.py @@ -41,11 +41,6 @@ def form_valid(self, form): response['Content-Disposition'] = 'inline; filename=files.json' return response - def get_context_data(self, **kwargs): - context = super(PictureCreateView, self).get_context_data(**kwargs) - context['pictures'] = Picture.objects.all() - return context - class PictureDeleteView(DeleteView): model = Picture From cb596ab9983aa6c9b899f6a9e4dcd451c0017d4d Mon Sep 17 00:00:00 2001 From: ET-CS Date: Mon, 12 Aug 2013 00:31:08 +0300 Subject: [PATCH 5/8] changes reverted --- fileupload/templates/base.html | 4 ++-- fileupload/templates/fileupload/picture_form.html | 6 +++++- fileupload/urls.py | 2 +- fileupload/views.py | 5 +++++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/fileupload/templates/base.html b/fileupload/templates/base.html index f27e644..8055775 100644 --- a/fileupload/templates/base.html +++ b/fileupload/templates/base.html @@ -9,7 +9,7 @@ - - + @@ -53,4 +53,4 @@

No content set

{% endblock %} - \ No newline at end of file + diff --git a/fileupload/templates/fileupload/picture_form.html b/fileupload/templates/fileupload/picture_form.html index bd704db..c9d4164 100644 --- a/fileupload/templates/fileupload/picture_form.html +++ b/fileupload/templates/fileupload/picture_form.html @@ -45,6 +45,10 @@

Basic Plus UI version

+

+ +

+

@@ -81,4 +85,4 @@

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/fileupload/urls.py b/fileupload/urls.py index b406020..790ed22 100644 --- a/fileupload/urls.py +++ b/fileupload/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url from fileupload.views import PictureCreateView, PictureDeleteView urlpatterns = patterns('', diff --git a/fileupload/views.py b/fileupload/views.py index 1291b20..bebdde7 100644 --- a/fileupload/views.py +++ b/fileupload/views.py @@ -41,6 +41,11 @@ def form_valid(self, form): response['Content-Disposition'] = 'inline; filename=files.json' return response + def get_context_data(self, **kwargs): + context = super(PictureCreateView, self).get_context_data(**kwargs) + context['pictures'] = Picture.objects.all() + return context + class PictureDeleteView(DeleteView): model = Picture From b02469a9a02b57bbf5056102b9ccb869c951c237 Mon Sep 17 00:00:00 2001 From: ET-CS Date: Mon, 12 Aug 2013 00:33:45 +0300 Subject: [PATCH 6/8] reverted urls.py --- fileupload/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fileupload/urls.py b/fileupload/urls.py index 790ed22..b406020 100644 --- a/fileupload/urls.py +++ b/fileupload/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, url +from django.conf.urls.defaults import patterns, url from fileupload.views import PictureCreateView, PictureDeleteView urlpatterns = patterns('', From a9f6089a3f7861a4ce2d0803c3672cb893e0618a Mon Sep 17 00:00:00 2001 From: ET-CS Date: Mon, 12 Aug 2013 00:36:33 +0300 Subject: [PATCH 7/8] chenges reverted --- fileupload/templates/base.html | 4 ++-- fileupload/templates/fileupload/picture_form.html | 6 +----- fileupload/views.py | 5 ----- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/fileupload/templates/base.html b/fileupload/templates/base.html index 8055775..f27e644 100644 --- a/fileupload/templates/base.html +++ b/fileupload/templates/base.html @@ -9,7 +9,7 @@ - + - @@ -53,4 +53,4 @@

No content set

{% endblock %} - + \ No newline at end of file diff --git a/fileupload/templates/fileupload/picture_form.html b/fileupload/templates/fileupload/picture_form.html index c9d4164..bd704db 100644 --- a/fileupload/templates/fileupload/picture_form.html +++ b/fileupload/templates/fileupload/picture_form.html @@ -45,10 +45,6 @@

Basic Plus UI version

-

- -

-

@@ -85,4 +81,4 @@

-{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/fileupload/views.py b/fileupload/views.py index bebdde7..1291b20 100644 --- a/fileupload/views.py +++ b/fileupload/views.py @@ -41,11 +41,6 @@ def form_valid(self, form): response['Content-Disposition'] = 'inline; filename=files.json' return response - def get_context_data(self, **kwargs): - context = super(PictureCreateView, self).get_context_data(**kwargs) - context['pictures'] = Picture.objects.all() - return context - class PictureDeleteView(DeleteView): model = Picture From 401b738e87e136033caf08c874f59b223318bfd0 Mon Sep 17 00:00:00 2001 From: ET-CS Date: Fri, 23 Aug 2013 13:51:36 +0300 Subject: [PATCH 8/8] fix from django.conf.urls.default --- fileupload/urls.py | 2 +- urls.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fileupload/urls.py b/fileupload/urls.py index b406020..790ed22 100644 --- a/fileupload/urls.py +++ b/fileupload/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url from fileupload.views import PictureCreateView, PictureDeleteView urlpatterns = patterns('', diff --git a/urls.py b/urls.py index 3a8fe65..00270ad 100644 --- a/urls.py +++ b/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, include, url +from django.conf.urls import patterns, include, url from django.http import HttpResponseRedirect # Uncomment the next two lines to enable the admin: @@ -21,5 +21,5 @@ import os urlpatterns += patterns('', - (r'^media/(.*)$', 'django.views.static.serve', {'document_root': os.path.join(os.path.abspath(os.path.dirname(__file__)), 'media')}), + (r'^media/(.*)$', 'django.views.static.serve', {'document_root': os.path.join(os.path.abspath(os.path.dirname(__file__)), 'media')}), )