Skip to content

Commit 63f77a7

Browse files
chore: remove unrelated changes from PR scope
Revert questionToggles.js and conftest.py to their origin/enext state. These changes (JS selector fixes and legacy import refactor) will be submitted in separate PRs as requested by the maintainer. Signed-off-by: Sarafaraj Nasardi <sarafarajnasardi786@gmail.com>
1 parent 4b92c59 commit 63f77a7

File tree

2 files changed

+20
-29
lines changed

2 files changed

+20
-29
lines changed

app/eventyay/static/orga/js/questionToggles.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ document.addEventListener('DOMContentLoaded', () => {
1313
});
1414

1515
function initToggles() {
16-
// Required status dropdowns - change event updates state (only those with data-question-id for AJAX)
17-
document.querySelectorAll('.required-status-dropdown[data-question-id]').forEach(dropdown => {
16+
// Required status dropdowns - change event updates state
17+
document.querySelectorAll('.required-status-dropdown:not([data-field-id])').forEach(dropdown => {
1818
dropdown.addEventListener('change', handleRequiredDropdownChange);
1919
});
2020

21-
// Binary toggles (active, is_public) - select only those with data-question-id for AJAX
22-
document.querySelectorAll('.toggle-switch[data-question-id] input').forEach(input => {
21+
// Binary toggles (active, is_public) - select only those without data-field-id (which are for form page)
22+
document.querySelectorAll('.toggle-switch:not([data-field-id]) input').forEach(input => {
2323
input.addEventListener('change', handleBinaryToggle);
2424
});
2525
}
@@ -180,8 +180,6 @@ function initFormPageToggles() {
180180
const requiredDropdown = document.querySelector(`.required-status-dropdown[data-field-id="${escapedId}"]`);
181181
const hiddenInput = document.getElementById(fieldId);
182182

183-
if (!hiddenInput || !requiredDropdown) return;
184-
185183
if (this.checked) {
186184
// Activate - restore previous state or default to 'optional'
187185
let state = hiddenInput.dataset.previousState || requiredDropdown.value;

app/tests/talk/conftest.py

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,27 @@
99
from django_scopes import scope, scopes_disabled
1010
from lxml import etree
1111

12-
from eventyay.base.models.settings import GlobalSettings
13-
from eventyay.base.models.event import Event
14-
from eventyay.base.models.organizer import Organizer as Organiser, Team, TeamInvite
15-
from eventyay.base.models.mail import MailTemplate
16-
from eventyay.base.models.information import SpeakerInformation
17-
from eventyay.base.models.profile import SpeakerProfile
18-
from eventyay.base.models.auth import User
19-
from eventyay.base.models.auth_token import UserApiToken, ENDPOINTS, generate_api_token
20-
from eventyay.base.models.availability import Availability
21-
from eventyay.base.models.room import Room
22-
from eventyay.base.models.slot import TalkSlot
23-
from eventyay.base.models.question import (
12+
from pretalx.common.models.settings import GlobalSettings
13+
from pretalx.event.models import Event, Organiser, Team, TeamInvite
14+
from pretalx.mail.models import MailTemplate
15+
from pretalx.person.models import SpeakerInformation, SpeakerProfile, User, UserApiToken
16+
from pretalx.person.models.auth_token import ENDPOINTS, generate_api_token
17+
from pretalx.schedule.models import Availability, Room, TalkSlot
18+
from pretalx.submission.models import (
2419
Answer,
2520
AnswerOption,
26-
TalkQuestion as Question,
27-
TalkQuestionVariant as QuestionVariant,
28-
TalkQuestionRequired as QuestionRequired,
29-
)
30-
from eventyay.base.models.submission import (
3121
Feedback,
22+
Question,
23+
QuestionVariant,
24+
Resource,
3225
Review,
3326
Submission,
27+
SubmissionType,
28+
SubmitterAccessCode,
3429
Tag,
30+
Track,
3531
)
36-
from eventyay.base.models.resource import Resource
37-
from eventyay.base.models.type import SubmissionType
38-
from eventyay.base.models.access_code import SubmitterAccessCode
39-
from eventyay.base.models.track import Track
32+
from pretalx.submission.models.question import QuestionRequired
4033

4134

4235
@pytest.fixture(scope="session", autouse=True)
@@ -744,7 +737,7 @@ def default_submission_type(event):
744737
def speaker(event):
745738
with scopes_disabled():
746739
user = User.objects.create_user(
747-
password="speakerpwd1!", fullname="Jane Speaker", email="jane@speaker.org"
740+
password="speakerpwd1!", name="Jane Speaker", email="jane@speaker.org"
748741
)
749742
with scope(event=event):
750743
SpeakerProfile.objects.create(
@@ -763,7 +756,7 @@ def speaker_client(client, speaker):
763756
def other_speaker(event):
764757
with scopes_disabled():
765758
user = User.objects.create_user(
766-
email="speaker2@example.com", password="speakerpwd1!", fullname="Krümelmonster"
759+
email="speaker2@example.com", password="speakerpwd1!", name="Krümelmonster"
767760
)
768761
with scope(event=event):
769762
SpeakerProfile.objects.create(user=user, event=event, biography="COOKIIIIES!!")

0 commit comments

Comments
 (0)