From 581aa832541e30f712384be8f33da9f6ece5f6c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BB=AF=E6=9D=91=E6=9C=88?= <liyudong1992@gmail.com>
Date: Fri, 21 Feb 2014 14:43:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=8Egroup=E4=B8=AD?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=85=83=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/model/User.coffee | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/core/model/User.coffee b/core/model/User.coffee
index e24c945..5d40413 100644
--- a/core/model/User.coffee
+++ b/core/model/User.coffee
@@ -32,7 +32,7 @@ module.exports = class User extends Model
   # @group 可以是数组，也可以是字符串，但是必须在['admin','user','trial']中
   # @callback 第一个参数是err,第二个参数是添加分组后的model
   # 用法：
-  #     user.addToGroup ['admin','users'],(err,result)->
+  #     user.addToGroup ['admin','user'],(err,result)->
   #       console.log result
   # 或
   #     user.addToGroup 'admin',(err,result)->
@@ -40,8 +40,20 @@ module.exports = class User extends Model
   addToGroup: (group,callback) ->
     group = [].push group if not _.isArray group
     for i in group
-      throw 'bad group' if i not in @constructor.validateData['group']
+      throw 'unknown group' if i not in @constructor.validateData['group']
     @update $addToSet:
       group:
         $each:group
+    ,callback
+  #从分组中移除
+  # @group [string]，必须在['admin','user','trial']中
+  # @callback 第一个参数是err,第二个参数是移除分组后的model
+  # 用法：
+  #     user.removeFromGroup 'user',(err,result)->
+  #       console.log result
+  removeFromGroup: (group,callback) ->
+    throw 'group must be string' if not _.isString group
+    throw 'unknown group' if group not in @constructor.validateData['group']
+    @update $pull:
+      group: group
     ,callback
\ No newline at end of file