diff options
| author | Adam Soltys <[email protected]> | 2016-09-22 11:34:43 -0700 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2016-09-22 11:35:34 -0700 |
| commit | 99b107eafa222a6e585e0e7efa1613a081dcb57c (patch) | |
| tree | 1cce66a8e260fdb5b60d67159004f8a0da0f7353 /src | |
| parent | cba0278cc681a10cb528ed16cfe500c9f20fc7a2 (diff) | |
| download | coinos-server-99b107eafa222a6e585e0e7efa1613a081dcb57c.tar.gz coinos-server-99b107eafa222a6e585e0e7efa1613a081dcb57c.zip | |
Display selected currency on the Sales page (fixes #50)
Diffstat (limited to 'src')
| -rw-r--r-- | src/routes/sessions.coffee | 1 | ||||
| -rw-r--r-- | src/routes/transactions.coffee | 12 | ||||
| -rw-r--r-- | src/routes/users.coffee | 3 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/routes/sessions.coffee b/src/routes/sessions.coffee index 5b1d9f06..6a441c75 100644 --- a/src/routes/sessions.coffee +++ b/src/routes/sessions.coffee @@ -17,6 +17,7 @@ module.exports = (passport) -> css: (-> global.css), badpw: true ) + req.session.user = user req.login(user, (err) -> if (err) return next(err) diff --git a/src/routes/transactions.coffee b/src/routes/transactions.coffee index 794d30d5..445bbc83 100644 --- a/src/routes/transactions.coffee +++ b/src/routes/transactions.coffee @@ -4,11 +4,13 @@ moment = require('moment') module.exports = index: (req, res) -> - res.render('transactions/index', - user: req.params.user, - layout: 'layout', - navigation: true, - js: (-> global.js), + res.render( + 'transactions/index' + user: req.params.user + currency: req.session.user.currency + layout: 'layout' + navigation: true + js: (-> global.js) css: (-> global.css) ) diff --git a/src/routes/users.coffee b/src/routes/users.coffee index ef295d3c..87fd0f51 100644 --- a/src/routes/users.coffee +++ b/src/routes/users.coffee @@ -159,6 +159,9 @@ module.exports = (sessions) -> delete req.body.password db.hmset("user:"+req.params.user.toLowerCase(), req.body, -> + req.session.user = req.body + delete req.session.user.password + if req.body.password? bcrypt.hash(req.body.password, 12, (err, hash) -> db.hmset("user:#{req.params.user.toLowerCase()}", password: hash, -> |