Merge branch 'develop' into feature/task_type_enum_singleselection

# Conflicts:
#	openpype/settings/entities/enum_entity.py
This commit is contained in:
iLLiCiTiT 2021-09-13 13:49:41 +02:00
commit c726e69f51
53 changed files with 2183 additions and 465 deletions

View file

@ -448,44 +448,6 @@ class TaskTypeEnumEntity(BaseEnumEntity):
self.set(value_on_not_set)
class ProvidersEnum(BaseEnumEntity):
schema_types = ["providers-enum"]
def _item_initalization(self):
self.multiselection = False
self.value_on_not_set = ""
self.enum_items = []
self.valid_keys = set()
self.valid_value_types = (STRING_TYPE, )
self.placeholder = None
def _get_enum_values(self):
from openpype_modules.sync_server.providers import lib as lib_providers
providers = lib_providers.factory.providers
valid_keys = set()
valid_keys.add('')
enum_items = [{'': 'Choose Provider'}]
for provider_code, provider_info in providers.items():
provider, _ = provider_info
enum_items.append({provider_code: provider.LABEL})
valid_keys.add(provider_code)
return enum_items, valid_keys
def set_override_state(self, *args, **kwargs):
super(ProvidersEnum, self).set_override_state(*args, **kwargs)
self.enum_items, self.valid_keys = self._get_enum_values()
value_on_not_set = list(self.valid_keys)[0]
if self._current_value is NOT_SET:
self._current_value = value_on_not_set
self.value_on_not_set = value_on_not_set
class DeadlineUrlEnumEntity(BaseEnumEntity):
schema_types = ["deadline_url-enum"]