Merge pull request #5 from metoro/master

Add phone+website

1 files changed, 19 insertions, 29 deletions

diff --git a/routes/users.coffee b/routes/users.coffee
index 0c292404..6d0d9fe7 100644
--- a/routes/users.coffee
+++ b/routes/users.coffee
@@ -3,7 +3,7 @@ bcrypt = require('bcrypt')
 
 module.exports = (sessions) ->
   exists: (req, res) ->
-  	
+      
     db.hgetall("user:"+req.params.user, (err, obj) ->
       if obj? then res.write('true') else res.write('false')
       res.end()
@@ -24,11 +24,19 @@ module.exports = (sessions) ->
     )
 
   new: (req, res) ->
-    res.render('users/new', 
-      js: (-> global.js), 
-      css: (-> global.css),
+    db.smembers('mts', (err, keys) ->
+       mts = []
+       for mt in keys
+          db.hgetall(mt, (err, it) ->
+            mts.push(it)
+            if keys.length==mts.length
+               res.render('users/new', 
+                  js: (-> global.js), 
+                  css: (-> global.css),
+                  mtypes: mts
+               )     
+          )
     )
-
   create: (req, res) ->
     userkey = "user:"+req.body.username
     db.hgetall(userkey, (err, obj) ->
@@ -36,30 +44,12 @@ module.exports = (sessions) ->
         res.redirect(req.body.username)
       else
         bcrypt.hash(req.body.password, 12, (err, hash) ->
-          db.sadd("users",userkey)
-          db.hmset(
-            userkey, 
-            {   
-                username: req.body.username, 
-                password: hash, 
-                email: req.body.email,
-                firstname: req.body.firstname,
-                lastname: req.body.lastname,
-                company: req.body.company,
-                email: req.body.email,
-                companytype: req.body.companytype,
-                address1: req.body.address1,
-                address2: req.body.address2,
-                city: req.body.city,
-                postcode: req.body.postcode,
-                state: req.body.state,
-                country: req.body.country   
-            }
-            ,
-            ->
+           db.sadd("users",userkey)
+           formfields = {username: req.body.username,password: hash,email: req.body.email,firstname: req.body.firstname,lastname: req.body.lastname,company: req.body.company,email: req.body.email,phone: req.body.phone,companytype: req.body.companytype,address1: req.body.address1,address2: req.body.address2,city: req.body.city,postcode: req.body.postcode,state: req.body.state,country: req.body.country,web: req.body.web}
+           db.hmset(userkey,formfields, ->
               req.headers['referer'] = "/#{req.body.username}/edit"
               sessions.create(req, res)
-          )
+           )
         )
     )
 
@@ -72,7 +62,7 @@ module.exports = (sessions) ->
 
   update: (req, res) ->
     return unless req.params.user is req.user.username or 
-      req.user.username is 'admin'
+    req.user.username is 'admin'
     db.hmset("user:"+req.params.user, req.body, ->
-     res.redirect("/#{req.params.user}")
+    res.redirect("/#{req.params.user}")
     )