Merge pull request #909 from Nandika-A/main

Resolved issue #859. Fixed attribute error.
DjangoGirls · Oct 2, 2023 · 6090c9f · 6090c9f
2 parents 2b2fc15 + 2627f65
commit 6090c9f
Show file tree

Hide file tree

Showing 48 changed files with 17 additions and 53 deletions.
diff --git a/applications/migrations/0001_initial.py b/applications/migrations/0001_initial.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

diff --git a/applications/migrations/0002_auto_20171216_2124.py b/applications/migrations/0002_auto_20171216_2124.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

diff --git a/applications/migrations/0003_auto_20180529_0016.py b/applications/migrations/0003_auto_20180529_0016.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("applications", "0002_auto_20171216_2124"),
     ]

diff --git a/applications/migrations/0004_add_on_delete.py b/applications/migrations/0004_add_on_delete.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("applications", "0003_auto_20180529_0016"),
     ]

diff --git a/applications/migrations/0005_auto_20210906_0915.py b/applications/migrations/0005_auto_20210906_0915.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("applications", "0004_add_on_delete"),
     ]

diff --git a/applications/migrations/0006_auto_20221231_1925.py b/applications/migrations/0006_auto_20221231_1925.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("applications", "0005_auto_20210906_0915"),
     ]

diff --git a/applications/services.py b/applications/services.py
@@ -4,6 +4,17 @@
 from core.models import User
 
 
+def get_default(order):
+    """
+    Gets the selected order and checks whether it contains more than one way of ordering.
+    If it does, this returns the first order selected.
+    This is to ensure that only one way of ordering is selected.
+    """
+    ind = order.find(",")
+    order = order[:ind]
+    return order
+
+
 def get_applications_for_event(event, state=None, rsvp_status=None, order=None, user: User = None):
     """
     Return a QuerySet of Application objects for a given event.
@@ -37,7 +48,9 @@ def get_applications_for_event(event, state=None, rsvp_status=None, order=None,
                 reverse=is_reversed,
             )
         else:
-            applications = sorted(applications, key=lambda app: getattr(app, order), reverse=is_reversed)
+            applications = sorted(
+                applications, key=lambda app: getattr(app, order, get_default(order)), reverse=is_reversed
+            )
 
     return applications
 

diff --git a/coach/migrations/0001_initial.py b/coach/migrations/0001_initial.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

diff --git a/coach/migrations/0002_alter_coach_id.py b/coach/migrations/0002_alter_coach_id.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("coach", "0001_initial"),
     ]

diff --git a/contact/migrations/0001_initial.py b/contact/migrations/0001_initial.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

diff --git a/contact/migrations/0002_contactemail_event.py b/contact/migrations/0002_contactemail_event.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

diff --git a/contact/migrations/0003_auto_20171217_1144.py b/contact/migrations/0003_auto_20171217_1144.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("contact", "0002_contactemail_event"),
     ]

diff --git a/contact/migrations/0004_alter_contactemail_id.py b/contact/migrations/0004_alter_contactemail_id.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("contact", "0003_auto_20171217_1144"),
     ]

diff --git a/core/management/commands/update_coordinates.py b/core/management/commands/update_coordinates.py
@@ -8,7 +8,6 @@ class Command(BaseCommand):
     help = "Update coordinates of event cities"
 
     def handle(self, *args, **options):
-
         events = Event.objects.all()
 
         for event in events:

diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py
@@ -9,7 +9,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

diff --git a/core/migrations/0002_auto_20171217_1144.py b/core/migrations/0002_auto_20171217_1144.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0001_initial"),
     ]

diff --git a/core/migrations/0003_auto_20210906_0915.py b/core/migrations/0003_auto_20210906_0915.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0002_auto_20171217_1144"),
     ]

diff --git a/core/migrations/0004_auto_20220422_1316.py b/core/migrations/0004_auto_20220422_1316.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0003_auto_20210906_0915"),
     ]

diff --git a/core/migrations/0005_auto_20220422_1321.py b/core/migrations/0005_auto_20220422_1321.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0004_auto_20220422_1316"),
     ]

diff --git a/globalpartners/migrations/0001_initial.py b/globalpartners/migrations/0001_initial.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

diff --git a/jobboard/migrations/0001_initial.py b/jobboard/migrations/0001_initial.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

diff --git a/jobboard/migrations/0002_auto_20230202_1131.py b/jobboard/migrations/0002_auto_20230202_1131.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("globalpartners", "0001_initial"),
         ("jobboard", "0001_initial"),

diff --git a/organize/migrations/0001_initial.py b/organize/migrations/0001_initial.py
@@ -8,7 +8,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

diff --git a/organize/migrations/0002_auto_20171217_1144.py b/organize/migrations/0002_auto_20171217_1144.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("organize", "0001_initial"),
     ]

diff --git a/organize/migrations/0003_auto_20190727_2013.py b/organize/migrations/0003_auto_20190727_2013.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("organize", "0002_auto_20171217_1144"),
     ]

diff --git a/organize/migrations/0004_auto_20201028_1923.py b/organize/migrations/0004_auto_20201028_1923.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("organize", "0003_auto_20190727_2013"),
     ]

diff --git a/organize/migrations/0005_eventapplication_additional.py b/organize/migrations/0005_eventapplication_additional.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("organize", "0004_auto_20201028_1923"),
     ]

diff --git a/organize/migrations/0006_eventapplication_diversity.py b/organize/migrations/0006_eventapplication_diversity.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("organize", "0005_eventapplication_additional"),
     ]

diff --git a/organize/migrations/0007_auto_20210906_1216.py b/organize/migrations/0007_auto_20210906_1216.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("organize", "0006_eventapplication_diversity"),
     ]

diff --git a/organize/migrations/0008_eventapplication_local_restrictions.py b/organize/migrations/0008_eventapplication_local_restrictions.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("organize", "0007_auto_20210906_1216"),
     ]

diff --git a/organize/migrations/0009_eventapplication_confirm_covid_19_protocols.py b/organize/migrations/0009_eventapplication_confirm_covid_19_protocols.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("organize", "0008_eventapplication_local_restrictions"),
     ]

diff --git a/patreonmanager/management/commands/fundraising_status.py b/patreonmanager/management/commands/fundraising_status.py
@@ -6,7 +6,6 @@
 from slack_sdk.errors import SlackApiError
 
 from core.slack_client import post_message_to_slack
-
 from patreonmanager.models import FundraisingStatus
 
 DJANGOGIRLS_USER_ID = 483065

diff --git a/patreonmanager/migrations/0001_initial.py b/patreonmanager/migrations/0001_initial.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

diff --git a/patreonmanager/migrations/0002_auto_20171217_1144.py b/patreonmanager/migrations/0002_auto_20171217_1144.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("patreonmanager", "0001_initial"),
     ]

diff --git a/patreonmanager/migrations/0003_auto_20210906_0915.py b/patreonmanager/migrations/0003_auto_20210906_0915.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("patreonmanager", "0002_auto_20171217_1144"),
     ]

diff --git a/pictures/migrations/0001_initial.py b/pictures/migrations/0001_initial.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

diff --git a/pictures/migrations/0002_alter_stockpicture_id.py b/pictures/migrations/0002_alter_stockpicture_id.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("pictures", "0001_initial"),
     ]

diff --git a/sponsor/migrations/0001_initial.py b/sponsor/migrations/0001_initial.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

diff --git a/sponsor/migrations/0002_donor.py b/sponsor/migrations/0002_donor.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("sponsor", "0001_initial"),
     ]

diff --git a/sponsor/migrations/0003_auto_20210906_0915.py b/sponsor/migrations/0003_auto_20210906_0915.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("sponsor", "0002_donor"),
     ]

diff --git a/story/management/commands/fetch_stories.py b/story/management/commands/fetch_stories.py
@@ -18,7 +18,6 @@ class Command(BaseCommand):
     help = "Fetch Django Girls stories from our blog"
 
     def handle(self, *args, **options):
-
         rss_url = "http://blog.djangogirls.org/rss"
 
         response = requests.get(rss_url)

diff --git a/story/migrations/0001_initial.py b/story/migrations/0001_initial.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

diff --git a/story/migrations/0002_alter_story_id.py b/story/migrations/0002_alter_story_id.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("story", "0001_initial"),
     ]

diff --git a/tests/applications/views/test_apply.py b/tests/applications/views/test_apply.py
@@ -79,7 +79,6 @@ def test_event_not_live(client, hidden_event):
 
 
 def test_application_form_valid(client, future_event_form, future_event):
-
     question_data = {
         "question_1": "Bill Smith",
         "question_2": "bill.smith@djangogirls.org",