Article Cleanup

taobataoma · Apr 2, 2014 · c11c428 · c11c428
1 parent 47561ce
commit c11c428
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 20 deletions.
diff --git a/app/controllers/articles.js b/app/controllers/articles.js
@@ -88,7 +88,7 @@ exports.list = function(req, res) {
  * Article middleware
  */
 exports.articleByID = function(req, res, next, id) {
-	Article.load(id, function(err, article) {
+	Article.findById(id).populate('user', 'displayName').exec(function(err, article) {
 		if (err) return next(err);
 		if (!article) return next(new Error('Failed to load article ' + id));
 		req.article = article;

diff --git a/app/models/article.js b/app/models/article.js
@@ -17,7 +17,8 @@ var ArticleSchema = new Schema({
 	title: {
 		type: String,
 		default: '',
-		trim: true
+		trim: true,
+		required: 'Title cannot be blank'
 	},
 	content: {
 		type: String,
@@ -30,22 +31,4 @@ var ArticleSchema = new Schema({
 	}
 });
 
-/**
- * Validations
- */
-ArticleSchema.path('title').validate(function(title) {
-	return title.length;
-}, 'Title cannot be blank');
-
-/**
- * Statics
- */
-ArticleSchema.statics = {
-	load: function(id, cb) {
-		this.findOne({
-			_id: id
-		}).populate('user', 'displayName').exec(cb);
-	}
-};
-
 mongoose.model('Article', ArticleSchema);