fefa4ka 10 years ago
parent bbdc103c87
commit 6bd05b9d02
  1. 1
      blog/views.py
  2. 2
      djangocms_forms/cms_plugins.py
  3. 8
      djangocms_forms/forms.py
  4. 2
      service/views.py

@ -21,7 +21,6 @@ class BaseBlogView(ViewUrlMixin, AppConfigMixin):
language = get_language() language = get_language()
queryset = self.model._default_manager.active_translations(language_code=language) queryset = self.model._default_manager.active_translations(language_code=language)
print self.config
if self.config and self.config.category_slug: if self.config and self.config.category_slug:
self._category = BlogCategory.objects.active_translations(get_language(), slug=self.config.category_slug).latest('pk') self._category = BlogCategory.objects.active_translations(get_language(), slug=self.config.category_slug).latest('pk')
queryset = queryset.filter(categories=self._category.pk) queryset = queryset.filter(categories=self._category.pk)

@ -103,7 +103,7 @@ class FormPlugin(CMSPluginBase):
def render(self, context, instance, placeholder): def render(self, context, instance, placeholder):
context = super(FormPlugin, self).render(context, instance, placeholder) context = super(FormPlugin, self).render(context, instance, placeholder)
request = context['request'] request = context['request']
# print instance.plugin_reference
try: try:
form_slug = "form-%d" % instance.plugin_reference.id form_slug = "form-%d" % instance.plugin_reference.id
except: except:

@ -295,24 +295,20 @@ class FormBuilder(forms.Form):
# Отправляем, только если конец сессии # Отправляем, только если конец сессии
# Если есть сессия для этой формы, то сохраняем в неё. # Если есть сессия для этой формы, то сохраняем в неё.
form_slug = "form-%d" % (self.form_definition.plugin_reference.id or self.form_definition.id) form_slug = "form-%d" % (self.form_definition.plugin_reference.id or self.form_definition.id)
print form_slug
if request.session.get(form_slug, False): if request.session.get(form_slug, False):
try: try:
form_instance = FormSubmission.objects.get(id=request.session.get(form_slug, False)) form_instance = FormSubmission.objects.get(id=request.session.get(form_slug, False))
form_data = form_instance.form_data form_data = form_instance.form_data
# print "LOADING ---"
# print form_data
except (FormSubmission.DoesNotExist): except (FormSubmission.DoesNotExist):
form_instance = None form_instance = None
# print "NOT EXIST"
# print form_data
pass pass
send = False send = False
client_mail_to = None
for data in form_data: for data in form_data:
if data['name'] == 'end_session': if data['name'] == 'end_session':
# print "SEND OK"
request.session[form_slug] = None request.session[form_slug] = None
send = True send = True
if data['type'] == 'email': if data['type'] == 'email':

@ -21,7 +21,7 @@ class BaseServiceView(ViewUrlMixin, AppConfigMixin):
language = get_language() language = get_language()
queryset = self.model._default_manager.active_translations(language_code=language) queryset = self.model._default_manager.active_translations(language_code=language)
print self.config
if self.config and self.config.category_slug: if self.config and self.config.category_slug:
self._category = ServiceCategory.objects.active_translations(get_language(), slug=self.config.category_slug).latest('pk') self._category = ServiceCategory.objects.active_translations(get_language(), slug=self.config.category_slug).latest('pk')
queryset = queryset.filter(categories=self._category.pk) queryset = queryset.filter(categories=self._category.pk)

Loading…
Cancel
Save