Merge pull request #330 from gcivil-nyu-org/backend/merge_master

Backend/merge master
gcivil-nyu-org · Apr 9, 2020 · 8f244f1 · 8f244f1
2 parents 420b5eb + 847804d
commit 8f244f1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/ag_data/models.py b/ag_data/models.py
@@ -53,9 +53,6 @@ class AGSensor(models.Model):
     name = models.CharField(max_length=1024, blank=True)
     type_id = models.ForeignKey(AGSensorType, null=False, on_delete=models.PROTECT)
 
-    # def __str__(self):
-    #    return u"{0}".format(self.name)
-
 
 class AGMeasurement(models.Model):
     """Stores the information about sensor measurements, including timestamp, event, sensor

diff --git a/mercury/grafanaAPI/grafana_api.py b/mercury/grafanaAPI/grafana_api.py
@@ -118,7 +118,7 @@ def get_dashboard_by_name(self, event_name):
             return None
 
     def get_dashboard_url_by_name(self, name):
-        name = name.lower().replace(" ", "-")
+        name = name.strip().lower().replace(" ", "-")
 
         dashboard = self.get_dashboard_by_name(name)
         if dashboard: