Merge branch 'hotfix/typos'

SpeedProg · May 6, 2019 · e60d50a · e60d50a
2 parents 3130939 + f5a92dd
commit e60d50a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/static/js/waitlist-dom.js b/static/js/waitlist-dom.js
@@ -704,7 +704,7 @@ waitlist.listdom = (function(){
 	 *            station={stationID=INT, stationName=STR},
 	 *            fcs=[{id=INT,name=STR,newbro=BOOL}...],
 	 *            managers=[{id=INT,name=STR,newbro=BOOL}...],
-	 *            fleets=[{grouID=INT, comp={id=INT,name=STR,newbro=BOOL}}...] }
+	 *            fleets=[{groupID=INT, comp={id=INT,name=STR,newbro=BOOL}}...] }
 	 */
 
 	function setStatusDom(groupStatus) {

diff --git a/waitlist/blueprints/fittings.py b/waitlist/blueprints/fittings.py
@@ -118,7 +118,7 @@ def move_to_waitlists():
         if is_new:
             _createdEntriesList.append(new_entry)
         else:
-            event = FitAddedSSE(group.grouID, new_entry.waitlist_id, new_entry.id, fit, False, new_entry.user)
+            event = FitAddedSSE(group.groupID, new_entry.waitlist_id, new_entry.id, fit, False, new_entry.user)
             _sseEvents.append(event)
 
 
@@ -236,7 +236,7 @@ def debug():
 @bp_waitlist.route("/history/")
 @login_required
 @perm_comp_view.require(http_exception=401)
-def history_default():  
+def history_default():
     return render_template("waitlist/history.html",
         stattool_enabled=stattool_enabled, stattool_uri=stattool_uri, stattool_sri=stattool_sri)