From 282c7de81697c86176e9b10740dfb1b49239bcb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=98ygard=20Ryjord?= Date: Mon, 9 Sep 2024 16:40:51 +0200 Subject: [PATCH 1/8] Changed meeting times and place Changed times and place as requested by the board --- nablapps/core/templates/core/general_about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nablapps/core/templates/core/general_about.html b/nablapps/core/templates/core/general_about.html index 432e9be9..8abf41b1 100644 --- a/nablapps/core/templates/core/general_about.html +++ b/nablapps/core/templates/core/general_about.html @@ -6,7 +6,7 @@

Linjeforeningen Nabla

Nabla er linjeforeningen for sivilingeniørprogrammet Fysikk og matematikk ved NTNU. Du kan lese mer om studiet på NTNU sine nettsider. På denne nettsiden finner du informasjon om studiet, linjeforeningen, og hva som foregår. Ta gjerne turen innom nablakontoret i kontortida for kaffe, vafler og en hyggelig prat. Vi selger også kompendier.

- Styremøter torsdager kl.10:15-12:00
+ Styremøter tirsdager kl.08:15-10:00 i R41
Styret har ukentlige møter, og her har du som komponent møterett. Om du vil komme innom på et av møtene våre, ta kontakt med et av styremedlemmene, eller hele styret: nabla@nabla.no

From 1868c539bd7d9522c9c45b738c26ce62c76b12bf Mon Sep 17 00:00:00 2001 From: Joliver Date: Sat, 21 Sep 2024 21:44:55 +0200 Subject: [PATCH 2/8] fix: slug now gets created separate to SlugField upon creation --- nablapps/events/models/event.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nablapps/events/models/event.py b/nablapps/events/models/event.py index 3da5d847..b2be701b 100644 --- a/nablapps/events/models/event.py +++ b/nablapps/events/models/event.py @@ -8,6 +8,7 @@ from django.core.exceptions import ValidationError from django.db import IntegrityError, models from django.urls import reverse +from django.utils.text import slugify from nablapps.core.models import TimeStamped, WithPicture from nablapps.jobs.models import Company @@ -124,6 +125,8 @@ def get_short_name(self): ) def save(self, *args, **kwargs): + if not self.slug: + self.slug = slugify(self.headline) super().save(*args, **kwargs) self.move_waiting_to_attending() From ffc350151322e8b1aba34b9ce6cefda03a891dea Mon Sep 17 00:00:00 2001 From: Joliver Date: Sun, 22 Sep 2024 11:07:39 +0200 Subject: [PATCH 3/8] update: headline is limited to 50 characters --- .../migrations/0015_alter_event_headline.py | 18 ++++++++++++++++++ nablapps/events/models/event.py | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 nablapps/events/migrations/0015_alter_event_headline.py diff --git a/nablapps/events/migrations/0015_alter_event_headline.py b/nablapps/events/migrations/0015_alter_event_headline.py new file mode 100644 index 00000000..40de26aa --- /dev/null +++ b/nablapps/events/migrations/0015_alter_event_headline.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.25 on 2024-09-22 10:59 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("events", "0014_auto_20220702_1315"), + ] + + operations = [ + migrations.AlterField( + model_name="event", + name="headline", + field=models.CharField(blank=True, max_length=50, verbose_name="tittel"), + ), + ] diff --git a/nablapps/events/models/event.py b/nablapps/events/models/event.py index b2be701b..b56310c2 100644 --- a/nablapps/events/models/event.py +++ b/nablapps/events/models/event.py @@ -30,6 +30,8 @@ class Event( Dukker opp som nyheter på forsiden. """ + headline = models.CharField(blank=True, max_length=50, verbose_name="tittel") + # Penalty_rules is a dict where key is an integer and value is # a tuple with the name of the rule as first element and # a dictionary with the rules as second element. From e2927acc8b3c7881054f1fe9420ff3c3c1bb5433 Mon Sep 17 00:00:00 2001 From: Joliver Date: Sun, 22 Sep 2024 12:10:21 +0200 Subject: [PATCH 4/8] Revert "update: headline is limited to 50 characters" This reverts commit ffc350151322e8b1aba34b9ce6cefda03a891dea. --- .../migrations/0015_alter_event_headline.py | 18 ------------------ nablapps/events/models/event.py | 2 -- 2 files changed, 20 deletions(-) delete mode 100644 nablapps/events/migrations/0015_alter_event_headline.py diff --git a/nablapps/events/migrations/0015_alter_event_headline.py b/nablapps/events/migrations/0015_alter_event_headline.py deleted file mode 100644 index 40de26aa..00000000 --- a/nablapps/events/migrations/0015_alter_event_headline.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.25 on 2024-09-22 10:59 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("events", "0014_auto_20220702_1315"), - ] - - operations = [ - migrations.AlterField( - model_name="event", - name="headline", - field=models.CharField(blank=True, max_length=50, verbose_name="tittel"), - ), - ] diff --git a/nablapps/events/models/event.py b/nablapps/events/models/event.py index b56310c2..b2be701b 100644 --- a/nablapps/events/models/event.py +++ b/nablapps/events/models/event.py @@ -30,8 +30,6 @@ class Event( Dukker opp som nyheter på forsiden. """ - headline = models.CharField(blank=True, max_length=50, verbose_name="tittel") - # Penalty_rules is a dict where key is an integer and value is # a tuple with the name of the rule as first element and # a dictionary with the rules as second element. From 8124d40ce9dce4873a3ea76b0aeb9ac04bc7cc61 Mon Sep 17 00:00:00 2001 From: Joliver Date: Sun, 22 Sep 2024 12:10:26 +0200 Subject: [PATCH 5/8] Revert "fix: slug now gets created separate to SlugField upon creation" This reverts commit 1868c539bd7d9522c9c45b738c26ce62c76b12bf. --- nablapps/events/models/event.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/nablapps/events/models/event.py b/nablapps/events/models/event.py index b2be701b..3da5d847 100644 --- a/nablapps/events/models/event.py +++ b/nablapps/events/models/event.py @@ -8,7 +8,6 @@ from django.core.exceptions import ValidationError from django.db import IntegrityError, models from django.urls import reverse -from django.utils.text import slugify from nablapps.core.models import TimeStamped, WithPicture from nablapps.jobs.models import Company @@ -125,8 +124,6 @@ def get_short_name(self): ) def save(self, *args, **kwargs): - if not self.slug: - self.slug = slugify(self.headline) super().save(*args, **kwargs) self.move_waiting_to_attending() From 3ed02e0851ea8d13f9a9dab93d2ccdfd8a3d5244 Mon Sep 17 00:00:00 2001 From: Joliver Date: Wed, 25 Sep 2024 11:03:32 +0200 Subject: [PATCH 6/8] feat: warning box for potential server issues --- nablapps/core/views.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nablapps/core/views.py b/nablapps/core/views.py index 5bf94169..037dcf1e 100644 --- a/nablapps/core/views.py +++ b/nablapps/core/views.py @@ -39,6 +39,11 @@ class FrontPageView(FlatPageMixin, TemplateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) + messages.warning( + self.request, + "På grunn av en serverkræsj og en rask migrering så kan nettsiden være noe ustabil for øyeblikket. Nablamailene er også nede så det er ikke mulig å sende mail til noen av @nabla.no mailadressene. WebKom jobber med å få dette fikset. Dersom noe ikke funker ta kontakt gjennom https://nabla.no/contact/feedback istedet for direkte på mail.", + ) + # Inject complicated context. # This context processing should perhaps be moved to the corresponding apps. self._add_news(context) From 3944d2dbd12053ef9d72e04fe83535d457e75244 Mon Sep 17 00:00:00 2001 From: Joliver Date: Thu, 3 Oct 2024 16:30:53 +0200 Subject: [PATCH 7/8] chore: edit warning text to reflect current situation --- nablapps/core/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nablapps/core/views.py b/nablapps/core/views.py index 037dcf1e..df4010da 100644 --- a/nablapps/core/views.py +++ b/nablapps/core/views.py @@ -41,7 +41,7 @@ def get_context_data(self, **kwargs): messages.warning( self.request, - "På grunn av en serverkræsj og en rask migrering så kan nettsiden være noe ustabil for øyeblikket. Nablamailene er også nede så det er ikke mulig å sende mail til noen av @nabla.no mailadressene. WebKom jobber med å få dette fikset. Dersom noe ikke funker ta kontakt gjennom https://nabla.no/contact/feedback istedet for direkte på mail.", + "På grunn av en serverkræsj og en rask migrering så kan nettsiden være noe ustabil for øyeblikket. WebKom jobber med å få dette fikset. Dersom noe ikke funker som det skal gjerne ta kontakt på webkom@nabla.no", ) # Inject complicated context. From 63453b5ba8fd18712c7dddada5e43506757d38e5 Mon Sep 17 00:00:00 2001 From: Joliver Date: Wed, 9 Oct 2024 18:43:37 +0200 Subject: [PATCH 8/8] chore: remove warning popup --- nablapps/core/views.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nablapps/core/views.py b/nablapps/core/views.py index df4010da..5bf94169 100644 --- a/nablapps/core/views.py +++ b/nablapps/core/views.py @@ -39,11 +39,6 @@ class FrontPageView(FlatPageMixin, TemplateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - messages.warning( - self.request, - "På grunn av en serverkræsj og en rask migrering så kan nettsiden være noe ustabil for øyeblikket. WebKom jobber med å få dette fikset. Dersom noe ikke funker som det skal gjerne ta kontakt på webkom@nabla.no", - ) - # Inject complicated context. # This context processing should perhaps be moved to the corresponding apps. self._add_news(context)