diff --git a/rowers/forms.py b/rowers/forms.py index 3d9e3e86..53770e44 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -236,7 +236,7 @@ class SearchForm(forms.Form): # simple form for Contact page. Sends email to info@rowsandall.com class EmailForm(forms.Form): firstname = forms.CharField(max_length=255) - lastname = forms.CharField(max_length=255) + lastname = forms.CharField(max_length=255, required=False) email = forms.EmailField() subject = forms.CharField(max_length=255) message = forms.CharField(widget=forms.Textarea()) diff --git a/rowers/templates/email.html b/rowers/templates/email.html index 86fd7b2e..dc31ae20 100644 --- a/rowers/templates/email.html +++ b/rowers/templates/email.html @@ -5,132 +5,132 @@
    -
  • - {% if form.errors %} -

    - Please correct the error{{ form.errors|pluralize }} below. -

    - {% endif %} - - -
    {% csrf_token %} -

    - - - - - -
    - - - - - -
    - - - - - - -
    - - - -
    - - - -
    - - - - - -
    - - - -
    - -
    -

    -
    +
  • + {% if form.errors %} +

    + Please correct the error{{ form.errors|pluralize }} below. +

    + {% endif %} + + +
    {% csrf_token %} +

    + + + + + +
    + + + + + +
    + + + + + + +
    + + + +
    + + + +
    + + + + + +
    + + + +
    + +
    +

    +
  • -

    Bug reporting, feature requests

    - -

    - Bug reports and feature requests can be done through our BitBucket page. Please check on the following link if your bug or issue is a known one. Feel free to file any feature request. -

      -
    • BitBucket Issue list (click here to go report an issue or request a feature)
      • -
    -

    +

    Bug reporting, feature requests

    + +

    + Bug reports and feature requests can be done through our BitBucket page. Please check on the following link if your bug or issue is a known one. Feel free to file any feature request. +

      +
    • BitBucket Issue list (click here to go report an issue or request a feature)
      • +
    +

  • -

    Facebook Group

    +

    Facebook Group

    + +

    We run a facebook group where you can post questions and report problems, + especially if you think the wider user community benefits from the answers.

    +
      +
    • https://www.facebook.com/groups/rowsandall/
      • +
    +
    • -

    We run a facebook group where you can post questions and report problems, - especially if you think the wider user community benefits from the answers.

    -
      -
    • https://www.facebook.com/groups/rowsandall/
      • -
    - +
  • +

    Twitter

    + +

    You can also check me on Twitter: +

      +
    • https://twitter.com/rowsandall +
    + When the site is down, this is the appropriate channel to look for apologies, updates, and offer help. +

    +
    • -
  • -

    Twitter

    +
  • +

    Rowsandall s.r.o.

    + +

    Rowsandall s.r.o.
    + Nové sady 988/2
    + 602 00 Brno
    + Czech Republic
    + IČ: 070 48 572
    + DIČ: CZ 070 48 572 (Nejsme plátce DPH)
    + Datová schránka: 7897syr
    + Email: info@rowsandall.com
    + The company is registered in the business register at the + Regional Court in Brno (Společnost je zapsána v obchodním rejstříku vedeném u Krajského soudu v Brně, oddíl C, vložka 105845)
    +

    + +
    • +
+{% endblock %} -

You can also check me on Twitter: -

    -
  • https://twitter.com/rowsandall -
- When the site is down, this is the appropriate channel to look for apologies, updates, and offer help. -

- +{% block sidebar %} +{% include 'menu_help.html' %} +{% endblock %} -
  • -

    Rowsandall s.r.o.

    - -

    Rowsandall s.r.o.
    - Nové sady 988/2
    - 602 00 Brno
    - Czech Republic
    - IČ: 070 48 572
    - DIČ: CZ 070 48 572 (Nejsme plátce DPH)
    - Datová schránka: 7897syr
    - Email: info@rowsandall.com
    - The company is registered in the business register at the - Regional Court in Brno (Společnost je zapsána v obchodním rejstříku vedeném u Krajského soudu v Brně, oddíl C, vložka 105845)
    -

    - -
    • - - {% endblock %} - - {% block sidebar %} - {% include 'menu_help.html' %} - {% endblock %} - - {% block scripts %} - - - {% endblock %} +{% block scripts %} + + +{% endblock %} diff --git a/rowers/tests/test_aworkouts.py b/rowers/tests/test_aworkouts.py index 79c139b1..c18a60bd 100644 --- a/rowers/tests/test_aworkouts.py +++ b/rowers/tests/test_aworkouts.py @@ -42,12 +42,7 @@ class ListWorkoutTest(TestCase): rowerplan='coach') self.c = Client() - self.user_workouts = WorkoutFactory.create_batch(len(workouttypes), user=self.r) - i = 0 - for workouttype in workouttypes: - self.user_workouts[i].workouttype = workouttype[0] - self.user_workouts[i].save() - i = i+1 + self.user_workouts = WorkoutFactory.create_batch(5, user=self.r) self.factory = RequestFactory() self.password = faker.word() diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 0fc0e3fd..f698047b 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ