diff --git a/proj/settings.py b/proj/settings.py
index 64c23040..f552c124 100644
--- a/proj/settings.py
+++ b/proj/settings.py
@@ -129,13 +129,13 @@ TEMPLATE_LOADERS = (
)
MIDDLEWARE_CLASSES = (
- 'django.middleware.cache.UpdateCacheMiddleware',
+# 'django.middleware.cache.UpdateCacheMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
- 'django.middleware.cache.FetchFromCacheMiddleware',
+# 'django.middleware.cache.FetchFromCacheMiddleware',
# Uncomment the next line for simple clickjacking protection:
# 'django.middleware.clickjacking.XFrameOptionsMiddleware',
#'debug_toolbar.middleware.DebugToolbarMiddleware',#должно быть последним полем
diff --git a/proj/views.py b/proj/views.py
index 6830baac..fa026682 100644
--- a/proj/views.py
+++ b/proj/views.py
@@ -45,23 +45,40 @@ def settings(request):
from directories.models import Currency
+from country.models import Country
+from country.forms import CountryForm
+from file.forms import FileModelForm
from django.views.decorators.cache import cache_page
-from django.core.cache import cache
+#from django.core.cache import cache
#@cache_page(30)
def test(request):
ids = [i for i in range(1, 5000)]
+ form = CountryForm()
+ file_form = FileModelForm
+ c = Country.objects.get(id=5)
+ country_id = getattr(c, 'id')
+
+ #args = {}
+ for i in range(1,10000):
+ args = {'languages': LANGUAGES, 'form': form, 'file_form': file_form, 'obj_id': country_id, 'files':FileModel.objects.filter(content_type=ContentType.objects.get_for_model(c), object_id=getattr(c, 'id'))}
+ #args['languages'] = LANGUAGES
+ #args['form'] = form
+ #args['file_form'] = file_form
+ #args['files'] = FileModel.objects.filter(content_type=ContentType.objects.get_for_model(c), object_id=getattr(c, 'id'))
+ #args['obj_id'] = country_id
- currs = [item for item in Currency.objects.all()]
- currs = []
- for i in ids:
- currs.append(Currency.objects.get(id=i))
- cache.set('key', currs[100].currency, 60)
+ #currs = [item for item in Currency.objects.all()]
+ #currs = []
+ #for i in ids:
+ # currs.append(Currency.objects.get(id=i))
- return HttpResponse('success')
+ #cache.set('key', currs[100].currency, 60)
+
+ return HttpResponse(args)
@@ -77,15 +94,20 @@ def ajax_city(request):
def ajax_tag(request):
"""
- returns html ';
+ }
+ });
+ $('#id_tag').append(html);
+ //select previous selected values
+ $('#id_tag option').each(function() {
+ var check = $.inArray($(this).val(), selectedValues)
+ if (check != -1){
+ $(this).attr('selected', 'selected');
+ }
+ });
+ });//end get
+ });//end change
+ });//end ready
\ No newline at end of file