Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/apps/api/serializers/competitions.py
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,8 @@ class Meta:
'reward',
'contact_email',
'report',
'whitelist_emails'
'whitelist_emails',
'forum_enabled'
)

def validate_phases(self, phases):
Expand Down Expand Up @@ -391,6 +392,7 @@ class Meta:
'contact_email',
'report',
'whitelist_emails',
'forum_enabled'
)

def get_leaderboards(self, instance):
Expand Down
2 changes: 1 addition & 1 deletion src/apps/competitions/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

class CompetitionAdmin(admin.ModelAdmin):
search_fields = ['title', 'docker_image', 'created_by__username']
list_display = ['title', 'created_by', 'is_featured']
list_display = ['id', 'title', 'created_by', 'is_featured']
list_filter = ['is_featured']


Expand Down
18 changes: 18 additions & 0 deletions src/apps/competitions/migrations/0053_competition_forum_enabled.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 2.2.28 on 2025-03-10 14:33

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('competitions', '0052_auto_20250129_1058'),
]

operations = [
migrations.AddField(
model_name='competition',
name='forum_enabled',
field=models.BooleanField(default=True),
),
]
3 changes: 3 additions & 0 deletions src/apps/competitions/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ class Competition(ChaHubSaveMixin, models.Model):
# Count of participants in this competition (default = 1 because competition creator is also a participant)
participants_count = models.PositiveIntegerField(default=1)

# If true, forum is enabled (default=True)
forum_enabled = models.BooleanField(default=True)

def __str__(self):
return f"competition-{self.title}-{self.pk}-{self.competition_type}"

Expand Down
3 changes: 2 additions & 1 deletion src/apps/competitions/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
"queue",
"description",
"registration_auto_approve",
"enable_detailed_results"
"enable_detailed_results",
"forum_enabled"
]

TASK_FIELDS = [
Expand Down
1 change: 1 addition & 0 deletions src/apps/competitions/unpackers/v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ def __init__(self, *args, **kwargs):
"fact_sheet": self.competition_yaml.get("fact_sheet", None),
"reward": self.competition_yaml.get("reward", None),
"contact_email": self.competition_yaml.get("contact_email", None),
"forum_enabled": self.competition_yaml.get("forum_enabled", True),
"pages": [],
"phases": [],
"leaderboards": [],
Expand Down
5 changes: 5 additions & 0 deletions src/apps/forums/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ class ForumBaseMixin(object):
def dispatch(self, *args, **kwargs):
# Get object early so we can access it in multiple places
self.forum = get_object_or_404(Forum, pk=self.kwargs['forum_pk'])

if not self.forum.competition.forum_enabled:
messages.error(self.request, "The forum for this competition is disabled.")
return redirect("competitions:detail", pk=self.forum.competition.pk)

if 'thread_pk' in self.kwargs:
self.thread = get_object_or_404(Thread, pk=self.kwargs['thread_pk'])

Expand Down
2 changes: 1 addition & 1 deletion src/static/riot/competitions/detail/_tabs.tag
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div class="item" data-tab="phases-tab">Phases</div>
<div class="item" data-tab="participate-tab">My Submissions</div>
<div class="item" data-tab="results-tab">Results</div>
<a class="item" href="{URLS.FORUM(competition.forum)}">Forum</a>
<a if="{ competition.forum_enabled }" class="item" href="{URLS.FORUM(competition.forum)}">Forum</a>
<div class="right menu">
<div class="item">
<help_button href="https://github.com/codalab/competitions-v2/wiki/Competition-Detail-Page"
Expand Down
18 changes: 18 additions & 0 deletions src/static/riot/competitions/editor/_competition_details.tag
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,22 @@
</sup>
</div>

<!-- Forum -->
<div class="field">
<label>Forum</label>
<div class="ui checkbox">
<label>Enable Competition Forum</label>
<input type="checkbox" ref="forum_enabled" onchange="{form_updated}">
</div>
<sup>
<span data-tooltip="If unchecked, organizers and participants cannot see competition forum"
data-inverted=""
data-position="bottom center">
<i class="help icon circle"></i>
</span>
</sup>
</div>


</div>

Expand Down Expand Up @@ -297,6 +313,7 @@
self.data["show_detailed_results_in_leaderboard"] = self.refs.show_detailed_results_in_leaderboard.checked
self.data["auto_run_submissions"] = self.refs.auto_run_submissions.checked
self.data["can_participants_make_submissions_public"] = self.refs.can_participants_make_submissions_public.checked
self.data["forum_enabled"] = self.refs.forum_enabled.checked
self.data["make_programs_available"] = self.refs.make_programs_available.checked
self.data["make_input_data_available"] = self.refs.make_input_data_available.checked
self.data["docker_image"] = $(self.refs.docker_image).val()
Expand Down Expand Up @@ -434,6 +451,7 @@
self.refs.show_detailed_results_in_leaderboard.checked = competition.show_detailed_results_in_leaderboard
self.refs.auto_run_submissions.checked = competition.auto_run_submissions
self.refs.can_participants_make_submissions_public.checked = competition.can_participants_make_submissions_public
self.refs.forum_enabled.checked = competition.forum_enabled
self.refs.make_programs_available.checked = competition.make_programs_available
self.refs.make_input_data_available.checked = competition.make_input_data_available
$(self.refs.docker_image).val(competition.docker_image)
Expand Down