Skip to content

Commit

Permalink
fix banner clock during days with non instructional events
Browse files Browse the repository at this point in the history
  • Loading branch information
pinwheeeel committed Oct 3, 2024
1 parent 7275578 commit 693e0b3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 4 additions & 2 deletions core/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
TagSuperuserAdminForm,
TermAdminForm,
UserAdminForm,
UserCreationAdminForm,
UserCreationForm,
)
from .models import Comment, StaffMember
from .utils.actions import (
Expand All @@ -34,6 +34,7 @@
reset_club_president,
send_notif_singleday,
send_test_notif,
set_club_open,
set_club_active,
set_club_unactive,
set_post_archived,
Expand Down Expand Up @@ -156,6 +157,7 @@ class OrganizationAdmin(admin.ModelAdmin):
OrganizationURLInline,
]
actions = [
set_club_open,
set_club_unactive,
set_club_active,
reset_club_president,
Expand Down Expand Up @@ -626,7 +628,7 @@ class UserAdmin(DjangoUserAdmin):
]
actions = [send_test_notif, send_notif_singleday]
form = UserAdminForm
add_form = UserCreationAdminForm
add_form = UserCreationForm

def get_inline_instances(self, request, obj=None):
if obj and StaffMember.objects.filter(user=obj).exists():
Expand Down
4 changes: 2 additions & 2 deletions core/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from django import forms
from django.conf import settings
from django.contrib.auth.forms import UserChangeForm as ContribUserChangeForm
from django.contrib.auth.forms import AdminUserCreationForm as ContribAdminUserCreationForm
from django.contrib.auth.forms import UserCreationForm as ContribUserCreationForm
from django.utils import timezone
from django_select2 import forms as s2forms
from martor.widgets import AdminMartorWidget
Expand Down Expand Up @@ -290,5 +290,5 @@ class UserAdminForm(CaseInsensitiveUsernameMixin, ContribUserChangeForm):
expo_notif_tokens = forms.JSONField(required=False)


class UserCreationAdminForm(CaseInsensitiveUsernameMixin, ContribAdminUserCreationForm):
class UserCreationForm(CaseInsensitiveUsernameMixin, ContribUserCreationForm):
pass
4 changes: 1 addition & 3 deletions core/models/course.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,7 @@ def day_num(self, target_date=None):
"calendar_days": self.__day_num_calendar_days,
}
target_date = utils.get_localdate(date=target_date, time=[23, 59, 59])
if not self.is_current(target_date.date()) or not self.day_is_instructional(
target_date
):
if not self.is_current(target_date.date()):
return None
return methods[tf.get("day_num_method", "consecutive")](tf, target_date)

Expand Down

0 comments on commit 693e0b3

Please sign in to comment.