mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-lazy-index
This commit is contained in:
commit
d05b47cdb6
|
@ -936,9 +936,12 @@ bool AstNode::isTrue () const {
|
|||
return getMember(1)->isTrue();
|
||||
}
|
||||
else if (type == NODE_TYPE_OPERATOR_UNARY_NOT) {
|
||||
return ! getMember(0)->isTrue();
|
||||
if (getMember(0)->isFalse()) {
|
||||
// ! false => true
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -978,7 +981,10 @@ bool AstNode::isFalse () const {
|
|||
return getMember(1)->isFalse();
|
||||
}
|
||||
else if (type == NODE_TYPE_OPERATOR_UNARY_NOT) {
|
||||
return ! getMember(0)->isFalse();
|
||||
if (getMember(0)->isTrue()) {
|
||||
// ! true => false
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
|
|
|
@ -504,6 +504,7 @@
|
|||
"databaseView",
|
||||
"databases-menu",
|
||||
{
|
||||
users: sessionDummy,
|
||||
collection: databaseDummy
|
||||
}
|
||||
);
|
||||
|
|
|
@ -39,6 +39,10 @@
|
|||
expect(view.colid).toEqual(0);
|
||||
expect(view.events).toEqual({
|
||||
"click #saveDocumentButton": "saveDocument",
|
||||
"click #deleteDocumentButton" : "deleteDocumentModal",
|
||||
"click #confirmDeleteDocument" : "deleteDocument",
|
||||
"click #document-from" : "navigateToDocument",
|
||||
"click #document-to" : "navigateToDocument",
|
||||
"dblclick #documentEditor tr" : "addProperty"
|
||||
});
|
||||
});
|
||||
|
|
|
@ -69,7 +69,9 @@
|
|||
"click #userManagementSearchSubmit" : "search",
|
||||
"click #callEditUserPassword" : "editUserPassword",
|
||||
"click #submitEditUserPassword" : "submitEditUserPassword",
|
||||
"click #submitEditCurrentUserProfile" : "submitEditCurrentUserProfile"
|
||||
"click #submitEditCurrentUserProfile" : "submitEditCurrentUserProfile",
|
||||
"click .css-label" : "checkBoxes",
|
||||
"change #userSortDesc" : "sorting"
|
||||
};
|
||||
expect(myEvents).toEqual(myView.events);
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue