Commit 5123ca29 authored by Nigel Kukard's avatar Nigel Kukard

Merge branch 'nkwork' into 'master'

Return properties with no options to matching without an option

See merge request !24
parents df782aa7 48eb2ce4
Pipeline #1935 passed with stages
in 1 minute and 17 seconds
......@@ -80,7 +80,9 @@ our (@EXPORT,@EXPORT_OK);
DATAOBJ_PROPERTY_NOSAVE
DATAOBJ_PROPERTY_ID
DATAOBJ_PROPERTY_REQUIRED
DATAOBJ_PROPERTY_ALL
DATAOBJ_PROPERTY_NONE
DATAOBJ_RELATION_READONLY
......@@ -112,8 +114,9 @@ use constant {
# This property must be set before doing a commit
'DATAOBJ_PROPERTY_REQUIRED' => 8,
# Match property
# Masks for property groups
'DATAOBJ_PROPERTY_ALL' => 255,
'DATAOBJ_PROPERTY_NONE' => 0,
# FIXME - Needs implementing
# Relation is read only, it will not create the sub-object
......@@ -1548,7 +1551,8 @@ sub _propertiesWithout
my $mask = DATAOBJ_PROPERTY_ALL &~ $option;
return $self->_properties($mask);
# Return based on property mask, but also return properties with no options set
return ($self->_properties($mask),$self->_properties(DATAOBJ_PROPERTY_NONE,DATAOBJ_PROPERTY_NONE));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment