diff --git a/amy/workshops/migrations/0265_add_member_code_and_override.py b/amy/workshops/migrations/0265_add_member_code_and_override.py index 792bcc6d1..dc8494a5f 100644 --- a/amy/workshops/migrations/0265_add_member_code_and_override.py +++ b/amy/workshops/migrations/0265_add_member_code_and_override.py @@ -4,27 +4,35 @@ class Migration(migrations.Migration): - - replaces = [('workshops', '0265_add_member_affiliation_and_member_code'), ('workshops', '0266_rename_group_name_trainingrequest_member_code'), ('workshops', '0267_trainingrequest_accept_invalid_member_code'), ('workshops', '0268_remove_workshoprequest_member_affiliation')] - dependencies = [ - ('workshops', '0264_trainingprogress_unique_trainee_at_event'), + ("workshops", "0264_trainingprogress_unique_trainee_at_event"), ] operations = [ migrations.AddField( - model_name='workshoprequest', - name='member_code', - field=models.CharField(blank=True, default='', help_text='If you are affiliated with a Carpentries member organization, please enter the registration code associated with the membership. Your Member Affiliate can provide this.', max_length=40, verbose_name='Membership registration code'), + model_name="workshoprequest", + name="member_code", + field=models.CharField( + blank=True, + default="", + help_text="If you are affiliated with a Carpentries member organization, please enter the registration code associated with the membership. Your Member Affiliate can provide this.", + max_length=40, + verbose_name="Membership registration code", + ), ), migrations.RenameField( - model_name='trainingrequest', - old_name='group_name', - new_name='member_code', + model_name="trainingrequest", + old_name="group_name", + new_name="member_code", ), migrations.AddField( - model_name='trainingrequest', - name='member_code_override', - field=models.BooleanField(blank=True, default=False, help_text='A member of our team will check the code and follow up with you if there are any problems that require your attention.', verbose_name='Continue with registration code marked as invalid'), + model_name="trainingrequest", + name="member_code_override", + field=models.BooleanField( + blank=True, + default=False, + help_text="A member of our team will check the code and follow up with you if there are any problems that require your attention.", + verbose_name="Continue with registration code marked as invalid", + ), ), ] diff --git a/amy/workshops/migrations/0266_alter_trainingrequest_default_for_text_fields.py b/amy/workshops/migrations/0266_alter_trainingrequest_default_for_text_fields.py new file mode 100644 index 000000000..8e1d88146 --- /dev/null +++ b/amy/workshops/migrations/0266_alter_trainingrequest_default_for_text_fields.py @@ -0,0 +1,41 @@ +# Generated by Django 3.2.20 on 2023-10-30 09:20 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("workshops", "0265_add_member_code_and_override"), + ] + + operations = [ + migrations.AlterField( + model_name="trainingrequest", + name="nonprofit_teaching_experience", + field=models.CharField( + blank=True, + default="", + help_text="Provide details or leave blank if this doesn't apply to you.", + max_length=255, + verbose_name="I have been an active contributor to other volunteer or non-profit groups with significant teaching or training components.", + ), + ), + migrations.AlterField( + model_name="trainingrequest", + name="previous_experience_explanation", + field=models.TextField( + blank=True, + default="", + verbose_name="Description of your previous experience in teaching", + ), + ), + migrations.AlterField( + model_name="trainingrequest", + name="previous_training_explanation", + field=models.TextField( + blank=True, + default="", + verbose_name="Description of your previous training in teaching", + ), + ), + ] diff --git a/amy/workshops/migrations/0269_alter_trainingrequest_default_for_text_fields.py b/amy/workshops/migrations/0269_alter_trainingrequest_default_for_text_fields.py deleted file mode 100644 index 0613df0f5..000000000 --- a/amy/workshops/migrations/0269_alter_trainingrequest_default_for_text_fields.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 3.2.20 on 2023-10-30 09:20 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('workshops', '0268_remove_workshoprequest_member_affiliation'), - ] - - operations = [ - migrations.AlterField( - model_name='trainingrequest', - name='nonprofit_teaching_experience', - field=models.CharField(blank=True, default='', help_text="Provide details or leave blank if this doesn't apply to you.", max_length=255, verbose_name='I have been an active contributor to other volunteer or non-profit groups with significant teaching or training components.'), - ), - migrations.AlterField( - model_name='trainingrequest', - name='previous_experience_explanation', - field=models.TextField(blank=True, default='', verbose_name='Description of your previous experience in teaching'), - ), - migrations.AlterField( - model_name='trainingrequest', - name='previous_training_explanation', - field=models.TextField(blank=True, default='', verbose_name='Description of your previous training in teaching'), - ), - ]