Performance/requirement assessment edit

backend/core/helpers.py

@@ -234,7 +234,7 @@ def get_sorted_requirement_nodes_rec(
                 "parent_urn": node.parent_urn,
                 "ref_id": node.ref_id,
                 "name": node.name,
-                "node_content": node.display_long(),
+                "node_content": node.display_long,
                 "style": "node",
                 "assessable": node.assessable,
                 "description": node.description,

backend/core/models.py

@@ -56,6 +56,7 @@ class ReferentialObjectMixin(NameDescriptionMixin, FolderMixin):
     class Meta:
         abstract = True
 
+    @property
     def display_short(self) -> str:
         _name = (
             self.ref_id
@@ -67,8 +68,9 @@ def display_short(self) -> str:
         _name = "" if not _name else _name
         return _name
 
+    @property
     def display_long(self) -> str:
-        _name = self.display_short()
+        _name = self.display_short
         _display = (
             _name
             if not self.description
@@ -79,7 +81,7 @@ def display_long(self) -> str:
         return _display
 
     def __str__(self) -> str:
-        return self.display_short()
+        return self.display_short
 
 
 class Library(ReferentialObjectMixin):
@@ -1503,7 +1505,7 @@ class Status(models.TextChoices):
     )
 
     def __str__(self) -> str:
-        return self.requirement.display_short()
+        return self.requirement.display_short
 
     class Meta:
         verbose_name = _("Requirement assessment")

backend/core/views.py

@@ -1494,7 +1494,7 @@ def generate_html_rec(requirement_node: RequirementNode):
             req for req in requirement_nodes if req.parent_urn == requirement_node.urn
         ]
         if not requirement_node.assessable:
-            _display = requirement_node.display_long()
+            _display = requirement_node.display_long
             table += f'<p class="font-semibold">{_display}  </p>'
             if children_nodes:
                 table += bar_graph(requirement_node)

backend/iam/models.py

@@ -596,7 +596,11 @@ def get_accessible_object_ids(
         folders_with_local_view = set()
         permissions_per_object_id = defaultdict(set)
         ref_permission = Permission.objects.get(codename="view_folder")
-        all_objects = object_type.objects.all()
+        all_objects = (
+            object_type.objects.select_related("folder")
+            if hasattr(object_type, "folder")
+            else object_type.objects.all()
+        )
         folder_for_object = {x: Folder.get_folder(x) for x in all_objects}
         perimeter = set()
         perimeter.add(folder)

frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.server.ts

@@ -31,8 +31,13 @@ export const load = (async ({ fetch, params }) => {
 
 	const model = getModelInfo(URLModel);
 
-	const objectEndpoint = `${BASE_API_URL}/${URLModel}/${params.id}/object/`;
-	const object = await fetch(objectEndpoint).then((res) => res.json());
+	const object = { ...requirementAssessment };
+	for (const key in object) {
+		if (object[key] instanceof Object && 'id' in object[key]) {
+			object[key] = object[key].id;
+		}
+	}
+
 	const schema = modelSchema(URLModel);
 	const form = await superValidate(object, schema, { errors: true });
 
@@ -245,7 +250,7 @@ export const actions: Actions = {
 		}
 		const object = await res.json();
 		const model: string = urlParamModelVerboseName(URLModel);
-		setFlash({ type: 'success', message: m.successfullySavedObject({object: model}) }, event);
+		setFlash({ type: 'success', message: m.successfullySavedObject({ object: model }) }, event);
 		redirect(
 			302,
 			event.url.searchParams.get('next') ||
@@ -304,7 +309,13 @@ export const actions: Actions = {
 		}
 
 		const model: string = urlParamModelVerboseName(URLModel);
-		setFlash({ type: 'success', message: m.successfullyUpdatedObject({object: model, name:form.data.name}) }, event);
+		setFlash(
+			{
+				type: 'success',
+				message: m.successfullyUpdatedObject({ object: model, name: form.data.name })
+			},
+			event
+		);
 		return { form };
 	},
 	createEvidence: async (event) => {
@@ -362,7 +373,13 @@ export const actions: Actions = {
 		}
 
 		const model: string = urlParamModelVerboseName(URLModel);
-		setFlash({ type: 'success', message: m.successfullyUpdatedObject({object: model, name:form.data.name}) }, event);
+		setFlash(
+			{
+				type: 'success',
+				message: m.successfullyUpdatedObject({ object: model, name: form.data.name })
+			},
+			event
+		);
 		return { form };
 	}
 };