-
Notifications
You must be signed in to change notification settings - Fork 22
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix: treat invalid model with data as valid during view tree creation #651
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1029,7 +1029,9 @@ | |
}; | ||
|
||
/** | ||
* | ||
* Returns models for view tree. | ||
* It consists of models and their statuses (ok / error). | ||
* If any of the models has error status - ns-view-error-content mode will be rendered for that view. | ||
* @returns {*} | ||
* @private | ||
*/ | ||
|
@@ -1041,7 +1043,10 @@ | |
/** @type ns.Model */ | ||
var model = models[id]; | ||
modelsData[id] = {}; | ||
if (model.isValid()) { | ||
// treat model as valid in case | ||
// - it is really a valid one | ||
// - it has invalid status but in has real data too (@see #649) | ||
if (model.isValid() || (model.status === this.STATUS.INVALID && !!model.getData())) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. а если зашить это в There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Страшно да .. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. окай |
||
// successful model status | ||
modelsData[id].status = 'ok'; | ||
// structure for convenient matching | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Точно
returns models
? А то эта строчка говоритany
(в сам код, без дифа не смотрел, может быть там все правильно)