Merge branch 'feature/OP-7176_Use-folder-path-as-unique-identifier' into feature/OP-7190_Use-folder-path-as-identifier-in-editorial

openpype/client/server/entities.py

@@ -241,21 +241,9 @@ def get_assets(
     if not new_asset_names:
         return
 
-    folders_by_name = collections.defaultdict(list)
     for folder in _folders_query(
         project_name, con, fields, folder_names=new_asset_names, **kwargs
     ):
-        folders_by_name[folder["name"]].append(folder)
-
-    for name, folders in folders_by_name.items():
-        folder = next(
-            (
-                folder
-                for folder in folders
-                if folder["path"] == name
-            ),
-            folders[0]
-        )
         yield convert_v4_folder_to_v3(folder, project_name)
 
 

openpype/modules/timers_manager/timers_manager.py

@@ -247,7 +247,7 @@ class TimersManager(
         return {
             "project_name": project_name,
             "asset_id": str(asset_doc["_id"]),
-            "asset_name": asset_doc["name"],
+            "asset_name": asset_name,
             "task_name": task_name,
             "task_type": task_type,
             "hierarchy": hierarchy_items