Closed Bug 916839 Opened 11 years ago Closed 11 years ago

Fix the code in webmaker.org/lib/events to match webmaker-events master from Aug 30

Categories

(Webmaker Graveyard :: webmaker.org, defect)

x86
macOS
defect
Not set
critical

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: humph, Assigned: kate)

References

Details

Attachments

(2 files)

When we moved webmaker-events into webmaker.org, we missed a few things in the deps for package.json, including:

* Missing - "webmaker-postalservice": "https://github.com/mozilla/node-webmaker-postalservice/tarball/v0.2.3"

* Version change - moment is 2.0.0 in webmaker.org, and was 2.1.x in webmaker-events
It looks like we're also missing Jon's email changes to webmaker-events, see https://github.com/mozilla/webmaker-events/commit/4c971c81f619c0fc63946f4380ca9a384d9633cc

What version of webmaker-events was used to import into webmaker.org?
Flags: needinfo?(kate)
The moment.js stuff is only used server-side in the scripts/sequelize script, which is for migrations, and isn't connected to this code at runtime.

Morphing this bug, so we figure out everything that got lost in the move from webmaker-events to webmaker.org.  For sure that includes the email stuff and webmaker-postalservice; it might be other things too.
Summary: Add webmaker-postalservice back to webmaker.org/events → Fix the code in webmaker.org/lib/events to match webmaker-events master from Aug 30
Looks like my head was at https://github.com/mozilla/webmaker-events/commit/7c5c5676269dc76cc2a0845893a7497f321d6a18 when I moved everything in, so all commits above that were lost.

That includes a confirmation dialog, localization work, and jon's email stuff
Flags: needinfo?(kate)
Attached patch missing.diffSplinter Review
Here's a DIFF of things between master on webmaker-events (89db97875e440e9168a446a147283159473ebebe) and what we have in webmaker.org master.  I haven't bothered with a lot of the front-end code, like images, jquery, and the like, or included whitespace changes.
Assignee: david.humphrey → kate
Let's prioritize this, as I strongly suspect it of being involved in, or causing our webmaker.org events crash.  Moving to Critical.
Severity: normal → critical
I included links to original commit when applying each diff, please check to make sure they are OK?
Attachment #805521 - Flags: review?(david.humphrey)
Attachment #805521 - Flags: feedback?(jon)
Comment on attachment 805521 [details] [review]
https://github.com/mozilla/webmaker.org/pull/373

Missing some error handling I added recently.  Also adding cade for another look, as some of his error handling has been stripped too.
Attachment #805521 - Flags: review?(david.humphrey)
Attachment #805521 - Flags: review?(cade)
Attachment #805521 - Flags: review-
Comment on attachment 805521 [details] [review]
https://github.com/mozilla/webmaker.org/pull/373

Left some comments in the PR to handle.
Attachment #805521 - Flags: review?(cade) → review-
Comment on attachment 805521 [details] [review]
https://github.com/mozilla/webmaker.org/pull/373

Ok, I merged everything back in. Should be good now.
Attachment #805521 - Flags: review?(david.humphrey)
Attachment #805521 - Flags: review?(cade)
Attachment #805521 - Flags: review-
Comment on attachment 805521 [details] [review]
https://github.com/mozilla/webmaker.org/pull/373

Removing myself so I don't block this landing, while I'm afk much of today.  I'll try to look at it again later today if it's still around (hopefully it isn't and you've all beat me to it).
Attachment #805521 - Flags: review?(david.humphrey)
Comment on attachment 805521 [details] [review]
https://github.com/mozilla/webmaker.org/pull/373

Looks good, travis build is passing. Tested event creation, email sending locally and it seems okay. Shall we get this onto staging?
Attachment #805521 - Flags: review?(cade) → review+
Comment on attachment 805521 [details] [review]
https://github.com/mozilla/webmaker.org/pull/373

Hooray, I get emails again!

Let's land this.
Attachment #805521 - Flags: feedback?(jon) → feedback+
Status: ASSIGNED → RESOLVED
Closed: 11 years ago
Resolution: --- → FIXED
Attachment mime type: text/plain → text/x-github-pull-request
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: