web - fixed displaying of empty names, minor changes

superstes · Apr 18, 2021 · 901acce · 901acce
1 parent e3ebb5e
commit 901acce
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/code/web/base/DISCLAIMOR.txt → code/web/base/DISCLAIMER.txt b/code/web/base/DISCLAIMOR.txt → code/web/base/DISCLAIMER.txt
@@ -1,5 +1,5 @@
 
-### DISCLAIMOR ###
+### DISCLAIMER ###
 
 I have little experience with the django framework, the mvc software design, UI-design and web-development itself.
 

diff --git a/code/web/base/ga/models.py b/code/web/base/ga/models.py
@@ -28,7 +28,13 @@ class BaseModel(BareModel):
     description = models.CharField(max_length=255, blank=True, null=True, default=None)
 
     def __str__(self):
-        return f"{self.name} | {self.description}"
+        if self.description is not None:
+            out = f'{self.name} | {self.description}'
+
+        else:
+            out = f'{self.name}'
+
+        return out
 
     class Meta:
         abstract = True

diff --git a/code/web/base/ga/templatetags/util.py b/code/web/base/ga/templatetags/util.py
@@ -299,3 +299,11 @@ def beta_mode(nope: None) -> bool:
 @register.filter
 def get_version(nope: None) -> float:
     return VERSION
+
+
+@register.filter
+def empty_if_none(check: str) -> str:
+    if check in [None, 'None']:
+        return ''
+
+    return check
diff --git a/code/web/base/static/css/ga.css b/code/web/base/static/css/ga.css
@@ -90,11 +90,8 @@ body {
     border-radius: 3px;
 }
 
-.ga-chart {
+.ga-chart-config {
     position: relative;
-}
-
-.ga-chart-main {
     height: 45vh;
     width: 90vw;
     margin: 3vh auto;