diff --git a/web/src/main/html/templates/docs/api/v2/events.html b/web/src/main/html/templates/docs/api/v2/events.html index 781fdd95..7f34e286 100644 --- a/web/src/main/html/templates/docs/api/v2/events.html +++ b/web/src/main/html/templates/docs/api/v2/events.html @@ -368,7 +368,7 @@ "event_id": "e7gqkup5l8", "epoch_start": 1521732600000, "epoch_end": 1521732600000, - "summary": "Weekly study group", + "name": "Weekly study group", "description": "Time to study!", "location": "Building A, Room 205", "is_parent": false, @@ -445,9 +445,9 @@ The time the event ends at - summary + name String - The summary/name of the event. *May not always be included* + The name of the event. *May not always be included* description @@ -543,7 +543,7 @@ "event_id": "e7gqkup5l8", "epoch_start": 1521732600000, "epoch_end": 1521732600000, - "summary": "Weekly study group", + "name": "Weekly study group", "description": "Time to study!", "location": "Building A, Room 205", "is_parent": false, @@ -632,9 +632,9 @@ The time the event ends at - events.summary + events.name String - The summary/name of the event. *May not always be included* + The name of the event. *May not always be included* events.description @@ -730,7 +730,7 @@ "event_id": "e7gqkup5l8", "epoch_start": 1521732600000, "epoch_end": 1521732600000, - "summary": "Weekly study group", + "name": "Weekly study group", "description": "Time to study!", "location": "Building A, Room 205", "is_parent": false, @@ -813,7 +813,7 @@ The time the event ends at - events.summary + events.name String The summary/name of the event. *May not always be included* @@ -911,7 +911,7 @@ "event_id": "e7gqkup5l8", "epoch_start": 1521732600000, "epoch_end": 1521732600000, - "summary": "Weekly study group", + "name": "Weekly study group", "description": "Time to study!", "location": "Building A, Room 205", "is_parent": false, @@ -1000,9 +1000,9 @@ The time the event ends at - events.summary + events.name String - The summary/name of the event. *May not always be included* + The name of the event. *May not always be included* events.description @@ -1096,7 +1096,7 @@ "event_id": "e7gqkup5l8", "epoch_start": 1521732600000, "epoch_end": 1521732600000, - "summary": "Weekly study group", + "name": "Weekly study group", "description": "Time to study!", "location": "Building A, Room 205", "is_parent": false, @@ -1173,9 +1173,9 @@ The time the event ends at - events.summary + events.name String - The summary/name of the event. *May not always be included* + The name of the event. *May not always be included* events.description @@ -1257,7 +1257,7 @@ "event_id": "e7gqkup5l8", "epoch_start": 1521732600000, "epoch_end": 1521732600000, - "summary": "Weekly study group", + "name": "Weekly study group", "description": "Time to study!", "location": "Building A, Room 205", "is_parent": false, @@ -1320,7 +1320,7 @@ The time the event ends at - summary + name String The summary/name of the event. *Optional* @@ -1423,7 +1423,7 @@ "calendar_number": 1, "event_id": "e7gqkup5l8", "epoch_end": 1521732600000, - "summary": "Weekly study group", + "name": "Weekly study group", "location": "Building A, Room 205", "is_parent": false, "color": "RED", @@ -1484,9 +1484,9 @@ The time the event ends at - summary + name String - The summary/name of the event. *Optional* + The name of the event. *Optional* description diff --git a/web/src/main/javascript/objects/event/Event.ts b/web/src/main/javascript/objects/event/Event.ts index 79c5017a..645b44a5 100644 --- a/web/src/main/javascript/objects/event/Event.ts +++ b/web/src/main/javascript/objects/event/Event.ts @@ -161,7 +161,7 @@ export class Event { }; if (this.summary.length > 0) { - json.summary = this.summary; + json.name = this.summary; } if (this.description.length) { json.description = this.description; @@ -185,8 +185,8 @@ export class Event { this.epochStart = json.epoch_start; this.epochEnd = json.epoch_end; - if (json.hasOwnProperty("summary")) { - this.summary = json.summary; + if (json.hasOwnProperty("name")) { + this.summary = json.name; } if (json.hasOwnProperty("description")) { this.description = json.description;