From 307e57bbfdb626859b2743520ca5712111ae17a4 Mon Sep 17 00:00:00 2001
From: Thomas Fricard <tfricard@ws114.prs.vfx.int>
Date: Wed, 29 Mar 2023 16:33:04 +0200
Subject: [PATCH] change variables name for template

---
 openpype/hosts/maya/api/plugin.py                     | 10 ++++++----
 openpype/settings/defaults/project_settings/maya.json |  2 +-
 website/docs/admin_hosts_maya.md                      |  8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/openpype/hosts/maya/api/plugin.py b/openpype/hosts/maya/api/plugin.py
index 15d6a4e5a4..2c5d1f1def 100644
--- a/openpype/hosts/maya/api/plugin.py
+++ b/openpype/hosts/maya/api/plugin.py
@@ -144,13 +144,13 @@ class ReferenceLoader(Loader):
 
         asset = context['asset']
         subset = context['subset']
-        settings = get_project_settings(os.environ['AVALON_PROJECT'])
+        settings = get_project_settings(context['project']['name'])
+        custom_naming = settings['maya']['load']['reference_loader']['naming']
         loaded_containers = []
 
         count = options.get("count") or 1
 
         for c in range(0, count):
-            custom_naming = settings['maya']['load']['reference_loader']['naming']  # noqa
             group_name = None
 
             if ':' not in custom_naming:
@@ -169,8 +169,10 @@ missing content after ':' separator"
                 )
 
             custom_naming = custom_naming.format(
-                asset=asset,
-                subset=subset
+                asset_name=asset['name'],
+                asset_type=asset['type'],
+                subset=subset['name'],
+                family=subset['data'].get('family') or subset['data']['families'][0]  # noqa
             )
 
             namespace = custom_naming.split(':')[0]
diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 7e26020452..8e57b09aff 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -1049,7 +1049,7 @@
             ]
         },
         "reference_loader": {
-            "naming": "{asset[name]}_{subset[name]}_:_GRP"
+            "naming": "{asset_name}_{subset}_:_GRP"
         }
     },
     "workfile_build": {
diff --git a/website/docs/admin_hosts_maya.md b/website/docs/admin_hosts_maya.md
index 25e69a0b53..6f64dfa4e6 100644
--- a/website/docs/admin_hosts_maya.md
+++ b/website/docs/admin_hosts_maya.md
@@ -184,10 +184,10 @@ Here's the different variables you can use:
 
 | Token | Description |
 |---|---|
-|`{asset[name]}` | Asset name |
-|`{asset[type]}` | Asset type |
-|`{subset[name]}` | Subset name |
-|`{subset[data][family]}` | Subset family |
+|`{asset_name}` | Asset name |
+|`{asset_type}` | Asset type |
+|`{subset}` | Subset name |
+|`{family}` | Subset family |
 
 </div>
 </div>