Changeset 1722 in main

Timestamp:

11/07/12 15:14:39 (8 years ago)

Author:

pcosquer

Message:

document3D: fix get_all_geometry_files (returned too many files)

File:

• trunk/openPLM/apps/document3D/models.py (modified) (3 diffs)

trunk/openPLM/apps/document3D/models.py

@@ -234 +234 @@
                 if tempfile_size:
                     filename = new_STP_file.filename
-                    path = docfs.get_available_name(filename)
+                    path = docfs.get_available_name(filename.encode("utf-8"))
                     shutil.copy(tempfile_size[0].name, docfs.path(path))
                     new_doc = DocumentFile.objects.create(file=path,
@@ -307 +307 @@
                 else:
                     self._stps = DocumentFile.objects.none().values_list("id", flat=True)
-            q = Q(stp=doc_file) | Q(stp__in=self._stps)
+            q = Q(stp=doc_file)
+            stps = list(self._stps)
+            if stps:
+                q |= Q(stp__in=self._stps)
             gfs = GeometryFile.objects.filter(q)
         else:
@@ -670 +673 @@
         old_product=Product_from_Arb(json.loads(old_arbre)) # doc_id and doc_path original
         new_stp_file=DocumentFile()
-        name = new_stp_file.file.storage.get_available_name(product.name+".stp".encode("utf-8"))
+        name = new_stp_file.file.storage.get_available_name((product.name+".stp").encode("utf-8"))
         new_stp_path = os.path.join(new_stp_file.file.storage.location, name)
         f = File(open(new_stp_path, 'w'))