Modify shotgrid server settings

openpype/settings/defaults/project_settings/shotgrid.json

@@ -1,10 +1,6 @@
 {
  "shotgrid_project_id": 0,
- "auth": {
- "project_shotgrid_url": "",
- "project_shotgrid_script_name": "",
- "project_shotgrid_script_key": ""
- },
+ "shotgrid_server": "",
  "event": {
  "enabled": false
  },

openpype/settings/defaults/system_settings/modules.json

@@ -140,9 +140,7 @@
  "shotgrid": {
  "enabled": true,
  "module_server_url": "",
- "shotgrid_url": "",
- "shotgrid_script_name": "",
- "shotgrid_script_key": ""
+ "shotgrid_settings": {}
  },
  "timers_manager": {
  "enabled": true,
@@ -212,4 +210,4 @@
  "linux": ""
  }
  }
-}
+}

openpype/settings/entities/__init__.py

@@ -107,6 +107,7 @@
  TaskTypeEnumEntity,
  DeadlineUrlEnumEntity,
  AnatomyTemplatesEnumEntity,
+ ShotgridUrlEnumEntity
 )
 
 from .list_entity import ListEntity
@@ -171,6 +172,7 @@
  "ToolsEnumEntity",
  "TaskTypeEnumEntity",
  "DeadlineUrlEnumEntity",
+ "ShotgridUrlEnumEntity",
  "AnatomyTemplatesEnumEntity",
 
  "ListEntity",

openpype/settings/entities/enum_entity.py

@@ -515,6 +515,45 @@ def set_override_state(self, *args, **kwargs):
  self._current_value = tuple(self.valid_keys)[0]
 
 
+class ShotgridUrlEnumEntity(BaseEnumEntity):
+ schema_types = ["shotgrid_url-enum"]
+
+ def _item_initialization(self):
+ self.multiselection = False
+
+ self.enum_items = []
+ self.valid_keys = set()
+
+ self.valid_value_types = (STRING_TYPE,)
+ self.value_on_not_set = ""
+
+ # GUI attribute
+ self.placeholder = self.schema_data.get("placeholder")
+
+ def _get_enum_values(self):
+ shotgrid_settings = self.get_entity_from_path(
+ "system_settings/modules/shotgrid/shotgrid_settings"
+ )
+
+ valid_keys = set()
+ enum_items_list = []
+ for server_name, settings in shotgrid_settings.items():
+ enum_items_list.append(
+ {server_name: "{}: {}".format(server_name, settings['shotgrid_url'].value)})
+ valid_keys.add(server_name)
+ return enum_items_list, valid_keys
+
+ def set_override_state(self, *args, **kwargs):
+ super(ShotgridUrlEnumEntity, self).set_override_state(*args, **kwargs)
+
+ self.enum_items, self.valid_keys = self._get_enum_values()
+ if not self.valid_keys:
+ self._current_value = ""
+
+ elif self._current_value not in self.valid_keys:
+ self._current_value = tuple(self.valid_keys)[0]
+
+
 class AnatomyTemplatesEnumEntity(BaseEnumEntity):
  schema_types = ["anatomy-templates-enum"]
 

openpype/settings/entities/schemas/projects_schema/schema_project_shotgrid.json

@@ -11,31 +11,9 @@
  "label": "Shotgrid project id"
  },
  {
- "type": "dict",
- "key": "auth",
- "label": "Authentication",
- "collapsible": true,
- "children": [
- {
- "type": "label",
- "label": "You can specify a shotgun instance here, use System settings if you leave it blank"
- },
- {
- "type": "text",
- "key": "project_shotgrid_url",
- "label": "Server URL"
- },
- {
- "type": "text",
- "key": "project_shotgrid_script_name",
- "label": "Script Name"
- },
- {
- "type": "text",
- "key": "project_shotgrid_script_key",
- "label": "Script Key"
- }
- ]
+ "type": "shotgrid_url-enum",
+ "key": "shotgrid_server",
+ "label": "Shotgrid Server"
  },
  {
  "type": "dict",

openpype/settings/entities/schemas/system_schema/schema_modules.json

@@ -62,19 +62,29 @@
  "label": "Module Server URL"
  },
  {
- "type": "text",
- "key": "shotgrid_url",
- "label": "Shotgrid Server URL"
- },
- {
- "type": "text",
- "key": "shotgrid_script_name",
- "label": "Shotgrid Script Name"
- },
- {
- "type": "text",
- "key": "shotgrid_script_key",
- "label": "Shotgrid Script Key"
+ "type": "dict-modifiable",
+ "key": "shotgrid_settings",
+ "label": "Shotgrid Servers",
+ "object_type": {
+ "type": "dict",
+ "children": [
+ {
+ "key": "shotgrid_url",
+ "label": "Server URL",
+ "type": "text"
+ },
+ {
+ "key": "shotgrid_script_name",
+ "label": "Script Name",
+ "type": "text"
+ },
+ {
+ "key": "shotgrid_script_key",
+ "label": "Script api key",
+ "type": "text"
+ }
+ ]
+ }
  }
  ]
  },