From 0b8ed7dd78ad6500d96dd0cb38ade7c0b503d794 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 14 Mar 2017 15:13:10 +0100 Subject: [PATCH] Fix project form --- app/organization/projects/forms.py | 1 + app/organization/projects/models.py | 4 ++-- .../templates/projects/project_ict_create.html | 7 +++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/organization/projects/forms.py b/app/organization/projects/forms.py index a6211093..5ab93ff0 100644 --- a/app/organization/projects/forms.py +++ b/app/organization/projects/forms.py @@ -89,6 +89,7 @@ class ProjectUserImageInline(InlineFormSet): extra = 3 model = ProjectUserImage prefix = 'Private images' + text = "To be published only for ICT-Projects selected by the consortium" can_delete = False fields = ['file', 'credits'] diff --git a/app/organization/projects/models.py b/app/organization/projects/models.py index 3d5d1498..1c28f7d9 100644 --- a/app/organization/projects/models.py +++ b/app/organization/projects/models.py @@ -336,9 +336,9 @@ class ProjectPublicData(models.Model): project = models.ForeignKey(Project, verbose_name=_('project'), related_name='public_data', blank=True, null=True, on_delete=models.SET_NULL) brief_description = models.CharField(_('brief description'), max_length=110, help_text="Brief description of the challenges faced by the project to be used for wider communication strategy (e.g. Twitter) (110 characters max).") - challenges_description = models.TextField(_('full description'), help_text="Full description of the challenges faced by the project (100-150 words).") + challenges_description = models.TextField(_('challenges description'), help_text="Full description of the challenges faced by the project (100-150 words).") technology_description = models.TextField(_('technology description'), help_text="Must include the elements to be made available to the artist with sufficient functional and implementation details for enabling him/her to elaborate his/her technical approach (100-200 words).") - objectives_description = models.TextField(_('objective description'), help_text="What the project is looking to gain from the collaboration and what kind of artist would be suitable (100 – 150 words).") + objectives_description = models.TextField(_('objectives description'), help_text="What the project is looking to gain from the collaboration and what kind of artist would be suitable (100 – 150 words).") resources_description = models.TextField(_('resource description'), help_text="Resources available to the artist -- e.g. office facility, studio facility, technical equipment, internet connection, laboratory, and periods of availability for artistic production, staff possibly allocated to the project, available budget for travel, consumables and equipment, etc... (50 – 100 words).") period = models.CharField(_('period of implementation'), max_length=128, help_text="Possible period of implementation (must be part of the project implementation workplan)") image = models.FileField(_("Image"), max_length=1024, upload_to="images", help_text="Representing the project") diff --git a/app/themes/vertigo_starts_eu/templates/projects/project_ict_create.html b/app/themes/vertigo_starts_eu/templates/projects/project_ict_create.html index 9f5d8f70..a26dfe52 100644 --- a/app/themes/vertigo_starts_eu/templates/projects/project_ict_create.html +++ b/app/themes/vertigo_starts_eu/templates/projects/project_ict_create.html @@ -33,6 +33,13 @@ {{ formset.management_form }}

{{ formset.prefix }}

+ {% if "Private data" in formset.prefix %} +
To be available only to Vertigo partners and artists upon successfully obtaining the residency (except letter reserved to VERTIGO)
+ {% elif "Public data" in formset.prefix %} +
To be published only for ICT-Projects selected by the consortium
+ {% elif "Private images" in formset.prefix %} +
3 key images for inspiring artist + any video content available
+ {% endif %} {% for form in formset %} {% fields_for form %} {% endfor %} -- 2.39.5