Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-02 17:04:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

replaced had_default_value with has_default_value

Browse source
This commit is contained in:
iLLiCiTiT 2021-01-25 19:03:15 +01:00
parent b9c31d1c5d
commit 8abc15e341
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pype/settings/entities/base_entity.py
View file

@ -159,7 +159,7 @@ class BaseEntity:
self.defaults_not_set = False
# Default input attributes
self.had_default_value = False
self.has_default_value = False
self.has_studio_override = False
self.had_studio_override = False

12
pype/settings/entities/input_entities.py
View file

@ -95,7 +95,7 @@ class InputEntity(ItemEntity):
def update_default_value(self, value):
# NOTE must call set_override_state manually
self.default_value = value
self.had_default_value = value is not NOT_SET
self.has_default_value = value is not NOT_SET
def update_studio_values(self, value):
# NOTE must call set_override_state manually
@ -132,14 +132,14 @@ class InputEntity(ItemEntity):
return True
if self.override_state is OverrideState.DEFAULTS:
if not self.had_default_value:
if not self.has_default_value:
return True
elif self.override_state is OverrideState.STUDIO:
if self.has_studio_override != self.had_studio_override:
return True
if not self.has_studio_override and not self.had_default_value:
if not self.has_studio_override and not self.has_default_value:
return True
elif self.override_state is OverrideState.PROJECT:
@ -149,7 +149,7 @@ class InputEntity(ItemEntity):
if (
not self.has_project_override
and not self.has_studio_override
and not self.had_default_value
and not self.has_default_value
):
return True
return False
@ -195,9 +195,9 @@ class InputEntity(ItemEntity):
if value is NOT_SET:
value = self.value_on_not_set
self.had_default_value = False
self.has_default_value = False
else:
self.had_default_value = True
self.has_default_value = True
self.value_is_modified = False
self._current_value = copy.deepcopy(value)

10
pype/settings/entities/item_entities.py
View file

@ -419,6 +419,7 @@ class DictImmutableKeysEntity(ItemEntity):
return value, metadata
def update_default_value(self, value):
self.has_default_value = value is not NOT_SET
# TODO add value validation
value, metadata = self._prepare_value(value)
self.default_metadata = metadata
@ -778,6 +779,7 @@ class DictMutableKeysEntity(ItemEntity):
return value, metadata
def update_default_value(self, value):
self.has_default_value = value is not NOT_SET
value, metadata = self._prepare_value(value)
self.default_value = value
self.default_metadata = metadata
@ -934,13 +936,14 @@ class ListEntity(ItemEntity):
pass
def update_default_value(self, value):
pass
self.has_default_value = value is not NOT_SET
self.default_value = value
def update_studio_values(self, value):
pass
self.studio_override_value = value
def update_project_values(self, value):
pass
self.project_override_value = value
class PathEntity(ItemEntity):
@ -1163,6 +1166,7 @@ class ListStrictEntity(ItemEntity):
def update_default_value(self, value):
# TODO add value validation (length)
# TODO current_value
self.has_default_value = value is not NOT_SET
if value is NOT_SET:
for child_obj in self.children:
child_obj.update_default_value(value)