aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/app
diff options
context:
space:
mode:
authorDennis Eriksen <dennis.se@gmail.com>2013-05-26 12:28:04 +0200
committerDennis Eriksen <dennis.se@gmail.com>2013-05-26 12:28:04 +0200
commit7f0467cc5a5b069ed22f4917b5ada38406839254 (patch)
treef4cf4920b8b5f44219b81df120f5469996e69f0f /app
parentfixed some text (diff)
downloadDivid-7f0467cc5a5b069ed22f4917b5ada38406839254.tar.gz
just cleaning up a bit
Diffstat (limited to 'app')
-rw-r--r--app/controllers/system.js17
-rw-r--r--app/models/User.js5
2 files changed, 3 insertions, 19 deletions
diff --git a/app/controllers/system.js b/app/controllers/system.js
index 57dbe9d..2fcb0fd 100644
--- a/app/controllers/system.js
+++ b/app/controllers/system.js
@@ -33,7 +33,7 @@ Validator.prototype.getErrors = function() {
exports.index = function(req, res) {
if (req.user !== undefined) { return res.redirect('/dashboard'); }
res.render('index', { title: 'Divid', user: req.user });
- };
+}
exports.faq = function(req, res) {
@@ -57,23 +57,8 @@ exports.contact = function(req, res) {
* ===============================================================
*/
-
-
exports.dashboard = function(req, res) {
-/*
- Access.find({ user: req.user._id }, function(err, accesses) {
- if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
- console.log('accesses ' + accesses);
- accesses.forEach(function(access) {
- Project.load(access.project, function(err, project) {
- if (err) return res.status(500).render('error', { title: '500', text: 'En serverfeil oppstod', error: err.stack });
- projectList.push(project);
- console.log(project.user.username);
- });
- });
- });
-*/
if (req.user.status < 3) {
if (req.header('Referer') === undefined) { return res.status(403).render('error', { title: 403, text: 'Du har ikke tilgang til denne siden. Du må registrere deg først. Sjekk mailen din for å se invitekode.' }); }
else { return res.redirect('back'); }
diff --git a/app/models/User.js b/app/models/User.js
index 0dc38f3..668b36f 100644
--- a/app/models/User.js
+++ b/app/models/User.js
@@ -40,9 +40,7 @@ var UserSchema = new Schema({
* Virtuals
*/
-UserSchema
- .virtual('password')
- .set(function(password) {
+UserSchema.virtual('password').set(function(password) {
this._password = password
this.salt = this.makeSalt()
this.hashed_password = this.encryptPassword(password)
@@ -57,6 +55,7 @@ var validatePrecenceOf = function(value) {
return value && value.length;
}
+
// the four validations below only apply if you are signing up traditionally
UserSchema.path('name').validate(function(name) {