Skip to content

Commit 4f46a7f

Browse files
committed
调整 filterAttrs 的用户,直接定义数组即可
1 parent 29ae2c4 commit 4f46a7f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lib/model.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ model.findAllOpts = findAllOpts = (params, isAll = no) ->
9393
where = {}
9494
Model = @
9595
includes = modelInclude(params, Model.includes)
96-
_.each(Model.filterAttrs or Model.rawAttributes, (attr, name) ->
96+
_.each(Model.filterAttrs or _.keys(Model.rawAttributes), (name) ->
9797
utils.findOptFilter(params, name, where)
9898
)
9999
if Model.rawAttributes.isDelete and not params.showDelete
@@ -117,7 +117,7 @@ model.findAllOpts = findAllOpts = (params, isAll = no) ->
117117
if includes
118118
_.each(includes, (x) ->
119119
includeWhere = {}
120-
_.each(x.model.filterAttrs or x.model.rawAttributes, (attr, name) ->
120+
_.each(x.model.filterAttrs or _.keys(x.model.rawAttributes), (name) ->
121121
utils.findOptFilter(params[x.as], name, includeWhere, name)
122122
)
123123
if x.model.rawAttributes.isDelete and not params.showDelete

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "open-rest",
3-
"version": "6.1.0",
3+
"version": "6.2.0",
44
"description": "Standard rest server, Base on restify and sequelize",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)