jbdod/notes-ker-lann
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small changes

Browse source
This commit is contained in:
jbdoderlein 2024-08-13 10:02:50 +00:00
parent f93479e8e8
commit f00d7873c9
5 changed files with 13 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/member/forms.py
View file

@ -60,7 +60,7 @@ class ProfileForm(forms.ModelForm):
class Meta: class Meta:
model = Profile model = Profile
fields = '__all__' fields = '__all__'
exclude = ('user', 'email_confirmed', 'registration_valid', ) exclude = ('user', 'email_confirmed', 'registration_valid', 'section' )
class ImageForm(forms.Form): class ImageForm(forms.Form):

22
apps/member/models.py
View file

@ -43,7 +43,7 @@ class Profile(models.Model):
section = models.CharField( section = models.CharField(
verbose_name=_('section'), verbose_name=_('section'),
help_text=_('e.g. "1A0", "9A♥", "SAPHIRE"'), help_text=_('Auto generated'),
max_length=255, max_length=255,
blank=True, blank=True,
default="", default="",
@ -83,26 +83,6 @@ class Profile(models.Model):
default=False, default=False,
) )
ml_events_registration = models.CharField(
blank=True,
default='',
max_length=2,
choices=[
('', _("No")),
('fr', _("Yes")),
],
verbose_name=_("Register on the mailing list to stay informed of the events of the campus (1 mail/week)"),
)
ml_sport_registration = models.BooleanField(
default=False,
verbose_name=_("Register on the mailing list to stay informed of the sport events of the campus (1 mail/week)"),
)
ml_art_registration = models.BooleanField(
default=False,
verbose_name=_("Register on the mailing list to stay informed of the art events of the campus (1 mail/week)"),
)
report_frequency = models.PositiveSmallIntegerField( report_frequency = models.PositiveSmallIntegerField(
verbose_name=_("report frequency (in days)"), verbose_name=_("report frequency (in days)"),

4
apps/registration/templates/registration/mails/email_validation_email.html
View file

@ -17,8 +17,8 @@
</p> </p>
<p> <p>
<a href="https://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=token %}"> <a href="http://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=token %}">
https://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=token %} http://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=token %}
</a> </a>
</p> </p>

5
note_kfet/settings/base.py
View file

@ -221,8 +221,9 @@ MEDIA_URL = '/media/'
EMAIL_BACKEND = 'mailer.backend.DbBackend' EMAIL_BACKEND = 'mailer.backend.DbBackend'
MAILER_EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' MAILER_EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
EMAIL_USE_SSL = os.getenv('EMAIL_USE_SSL', False) EMAIL_USE_SSL = os.getenv('EMAIL_USE_SSL', False)
EMAIL_USE_TLS = os.getenv('EMAIL_USE_TLS', True)
EMAIL_HOST = os.getenv('EMAIL_HOST', 'smtp.example.org') EMAIL_HOST = os.getenv('EMAIL_HOST', 'smtp.example.org')
EMAIL_PORT = os.getenv('EMAIL_PORT', 25) EMAIL_PORT = os.getenv('EMAIL_PORT', 587)
EMAIL_HOST_USER = os.getenv('EMAIL_USER', None) EMAIL_HOST_USER = os.getenv('EMAIL_USER', None)
EMAIL_HOST_PASSWORD = os.getenv('EMAIL_PASSWORD', None) EMAIL_HOST_PASSWORD = os.getenv('EMAIL_PASSWORD', None)
@ -235,7 +236,7 @@ DEFAULT_FROM_EMAIL = "NoteKfet2020 <" + SERVER_EMAIL + ">"
cache_address = os.getenv("CACHE_ADDRESS", "127.0.0.1:11211") cache_address = os.getenv("CACHE_ADDRESS", "127.0.0.1:11211")
CACHES = { CACHES = {
'default': { 'default': {
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', 'BACKEND': 'django.core.cache.backends.memcached.PyMemcacheCache',
'LOCATION': cache_address, 'LOCATION': cache_address,
} }
} }

12
uwsgi_note.ini
View file

@ -4,25 +4,25 @@ uid = www-data
gid = www-data gid = www-data
# Django-related settings # Django-related settings
# the base directory (full path) # the base directory (full path)
chdir = /var/www/notes-ker-lann chdir = /var/www/notes-ker-lann/notes-ker-lann
# Django's wsgi file # Django's wsgi file
#module = winaps.wsgi:application #module = winaps.wsgi:application
# the virtualenv (full path) # the virtualenv (full path)
home = /var/www/notes-ker-lann/env home = /var/www/notes-ker-lann/notes-ker-lann/env
wsgi-file = /var/www/notes-ker-lann/note_kfet/wsgi.py wsgi-file = /var/www/notes-ker-lann/notes-ker-lann/note_kfet/wsgi.py
plugin = python3 plugin = python3
# process-related settings # process-related settings
# master # master
master = true master = true
# maximum number of worker processes # maximum number of worker processes
processes = 10 processes = 2
# the socket (use the full path to be safe # the socket (use the full path to be safe
socket = /var/www/notes-ker-lann/notes-ker-lann.sock socket = /var/www/notes-ker-lann/notes-ker-lann/notes-ker-lann.sock
# ... with appropriate permissions - may be needed # ... with appropriate permissions - may be needed
chmod-socket = 664 chmod-socket = 664
# clear environment on exit # clear environment on exit
vacuum = true vacuum = true
# Touch reload # Touch reload
touch-reload = /var/www/notes-ker-lann/note_kfet/settings/__init__.py touch-reload = /var/www/notes-ker-lann/notes-ker-lann/uwsgi_note.ini
# Enable threads # Enable threads
enable-threads = true enable-threads = true