From a611b6721cfbdb5a3b4fc75823cd68b7844db907 Mon Sep 17 00:00:00 2001
From: Sanjay B
Date: Sat, 1 Aug 2015 16:03:04 +0530
Subject: [PATCH] remove added by on script form, fix script template if
license not provided, make email field for person non-unique
---
itf/itfprofiles/models.py | 2 +-
itf/scriptbank/forms.py | 2 +-
itf/templates/modules/scriptbank/script.html | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/itf/itfprofiles/models.py b/itf/itfprofiles/models.py
index 9944233..a5246e9 100644
--- a/itf/itfprofiles/models.py
+++ b/itf/itfprofiles/models.py
@@ -31,7 +31,7 @@ class Person(ItfModel):
user = models.OneToOneField(User, blank=True, null=True, db_index=True)
first_name = models.CharField(max_length=255)
last_name = models.CharField(max_length=255)
- email = models.EmailField(blank=True, null=True, unique=True, db_index=True, help_text="Your email address will be kept confidential and will not be displayed on your profile page")
+ email = models.EmailField(blank=True, null=True, db_index=True, help_text="Your email address will be kept confidential and will not be displayed on your profile page")
tel_no = models.CharField(max_length=100, blank=True, verbose_name='Telephone number')
is_practitioner = models.BooleanField(default=False, verbose_name='Are you a theatre practitioner?', help_text="A 'theatre practitioner' refers to anyone actively involved in the process of production, ranging from the actors, to light designers, music directors, production, backstage, and so on")
is_freelancer = models.BooleanField(default=False, verbose_name='Are you a theatre associate?', help_text="By 'theatre associate' we mean anyone who works within the field of theatre, but may not be involved in particular productions: for instance: managers of theatre institutions, scholars, journalists, teachers, curators and so on") #Change to is_associate
diff --git a/itf/scriptbank/forms.py b/itf/scriptbank/forms.py
index b0cd390..c210767 100755
--- a/itf/scriptbank/forms.py
+++ b/itf/scriptbank/forms.py
@@ -22,7 +22,7 @@ class ScriptForm(ItfForm):
class Meta:
model = Script
- exclude = ('added_by', 'related_scripts')
+ exclude = ('added_by', 'related_scripts',)
widgets = {
'no_characters': forms.NumberInput,
'no_of_women': forms.NumberInput,
diff --git a/itf/templates/modules/scriptbank/script.html b/itf/templates/modules/scriptbank/script.html
index 95e48f9..2bd744c 100755
--- a/itf/templates/modules/scriptbank/script.html
+++ b/itf/templates/modules/scriptbank/script.html
@@ -47,6 +47,7 @@ $(function() {
+ {% if license_adapt.legal_file and license_perform.legal_file %}
Licenses:
This script may be accessed @@ -67,7 +68,7 @@ $(function() {
{{ license_perform.short_description|linebreaksbr }}
Read legal version - + {% endif %}