diff --git a/GeneralApp/models.py b/GeneralApp/models.py index 3167b03..47db03c 100644 --- a/GeneralApp/models.py +++ b/GeneralApp/models.py @@ -29,6 +29,7 @@ block_type_choices = ( ('how_work', _('Как с нами работать')), ('how_dev', _('Как ведется разработка')), ('feedback_form', _('Форма обратной связи')), + ('projects_block', _('Блок проектов')), # ('slider', _('Галерея слайдов')), ) diff --git a/ServicesApp/models.py b/ServicesApp/models.py index b348fe6..4dce95b 100644 --- a/ServicesApp/models.py +++ b/ServicesApp/models.py @@ -7,6 +7,9 @@ from django.contrib.contenttypes.fields import GenericForeignKey from django.contrib.contenttypes.fields import GenericRelation from django.core.validators import validate_image_file_extension +from PortfolioApp.models import Project + + class BlockPluginPresentation(Block_Abstract): from BaseModels.base_models import Manager_Enabled objects = models.Manager() @@ -59,6 +62,12 @@ class Section(BaseModelViewPage): related_query_name='grel_%(class)s_for_block_plugin_presentation') + def get_projects(self): + services_ids = self.rel_services_for_section.filter(enable=True).order_by('order').values_list('id', flat=True) + projects = Project.objects.filter(services__id=services_ids) + return projects + + class Meta: verbose_name = _('Раздел сайта') verbose_name_plural = _('Разделы сайта') diff --git a/templates/blocks/b_projects.html b/templates/blocks/b_projects.html index 566549b..bdf9505 100644 --- a/templates/blocks/b_projects.html +++ b/templates/blocks/b_projects.html @@ -1,10 +1,9 @@ - - - - - Title - - - - - \ No newline at end of file +
+ {% for project in page.get_projects %} +
+ {{ project.name }} + {{ project.description|safe|linebreaksbr }} + {{ project.name }} +
+ {% endfor %} +
\ No newline at end of file