Merge pull request #1539 from pypeclub/2.x/hotfix/celaction-deadline-…

…submission
ynput · May 24, 2021 · f54cbb8 · f54cbb8
2 parents 3758779 + b2e2313
commit f54cbb8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/pype/hosts/celaction/cli.py b/pype/hosts/celaction/cli.py
@@ -75,7 +75,7 @@ def _prepare_publish_environments():
  env["AVALON_WORKDIR"] = os.getenv("AVALON_WORKDIR")
  env["AVALON_HIERARCHY"] = hierarchy
  env["AVALON_PROJECTCODE"] = project_doc["data"].get("code", "")
- env["AVALON_APP"] = f"hosts.{publish_host}"
+ env["AVALON_APP"] = publish_host
  env["AVALON_APP_NAME"] = "celaction_local"
 
  env["PYBLISH_HOSTS"] = publish_host

diff --git a/pype/plugins/celaction/publish/collect_celaction_instances.py b/pype/plugins/celaction/publish/collect_celaction_instances.py
@@ -46,13 +46,14 @@ def process(self, context):
  subset = family + task.capitalize()
  # Create instance
  instance = context.create_instance(subset)
+ families = [family, "ftrack"]
 
  # creating instance data
  instance.data.update({
- "subset": subset,
+ "subset": "{} {}".format(subset, families),
  "label": scene_file,
  "family": family,
- "families": [family, "ftrack"],
+ "families": families,
  "representations": list()
  })
 
@@ -77,12 +78,13 @@ def process(self, context):
  instance = context.create_instance(name=subset)
  # getting instance state
  instance.data["publish"] = True
+ families = [family]
 
  # add assetEntity data into instance
  instance.data.update({
- "label": "{} - farm".format(subset),
+ "label": "{} {}".format(subset, families),
  "family": family,
- "families": [family],
+ "families": families,
  "subset": subset
  })