Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
public
/
sequelize
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
不要怂,就是干,撸起袖子干!
Commit 1d99a072
authored
Sep 17, 2015
by
Verdier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert scopeInclude clone. Better fixed by #4518
1 parent
abb9bd96
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
4 deletions
lib/model.js
lib/model.js
View file @
1d99a07
...
@@ -2542,7 +2542,7 @@ Model.prototype.$getDefaultTimestamp = function(attr) {
...
@@ -2542,7 +2542,7 @@ Model.prototype.$getDefaultTimestamp = function(attr) {
// Inject current scope into options. Includes should have been conformed (conformOptions) before calling this
// Inject current scope into options. Includes should have been conformed (conformOptions) before calling this
Model
.
$injectScope
=
function
(
scope
,
options
)
{
Model
.
$injectScope
=
function
(
scope
,
options
)
{
scope
=
optClone
(
scope
);
scope
=
optClone
(
scope
);
var
filteredScope
=
_
.
omit
(
scope
,
'include'
);
// Includes need special treatment
var
filteredScope
=
_
.
omit
(
scope
,
'include'
);
// Includes need special treatment
_
.
defaults
(
options
,
filteredScope
);
_
.
defaults
(
options
,
filteredScope
);
...
@@ -2562,9 +2562,6 @@ Model.$injectScope = function (scope, options) {
...
@@ -2562,9 +2562,6 @@ Model.$injectScope = function (scope, options) {
}
}
return
sameModel
;
return
sameModel
;
}))
{
}))
{
// Do not inject Model.$scope.include directly,
// make a shallow copy (#4470).
scopeInclude
=
_
.
clone
(
scopeInclude
);
options
.
include
.
push
(
scopeInclude
);
options
.
include
.
push
(
scopeInclude
);
}
}
});
});
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment