merge conflict saved

Hectruendo · Hectruendo · commit 1b2aff0625a8 · 2024-03-06T18:57:48.000+01:00
diff --git a/admin/components/labeling/KnowledgeItemReview.vue b/admin/components/labeling/KnowledgeItemReview.vue
@@ -72,9 +72,7 @@ async function initKIReview() {
             reviewedKIs.value.kis.push(ki)
     }
     review.value = await itemsStore.retrieveItems($axios, "/back/api/broker/admin-review/", {message: props.message.id, limit: 0, offset: 0, ordering: undefined}, false, true) || {}
-    ki_choices.value = await itemsStore.retrieveItems($axios, "/back/api/language-model/knowledge-items/", {
-        knowledge_base: references.knowledge_base_id
-    }, {knowledge_base__id: references.knowledge_base_id, limit: 0, offset: 0, ordering: undefined}, false)
+    ki_choices.value = (await itemsStore.retrieveItems($axios, "/back/api/language-model/knowledge-items/", {knowledge_base: references.knowledge_base_id, knowledge_base__id: references.knowledge_base_id, limit: 0, offset: 0, ordering: undefined}, false)).results
     itemsStore.loading = false
 }
 
@@ -141,7 +139,7 @@ function addAlternativeKI() {
             ki_review_data: []
         }
     }
-    return review.value.ki_review_data.push({
+    review.value.ki_review_data.push({
         value: "alternative",
         knowledge_item_id: null,
     })
diff --git a/back/back/apps/language_model/management/commands/migrate_knowledge_base.py b/back/back/apps/language_model/management/commands/migrate_knowledge_base.py
@@ -94,7 +94,6 @@ def saving_items(self, knowledge_items, images_data, destination_base):
                     knowledge_item.content = content
                     knowledge_item.save()
 
-        self.stdout.write(self.style.SUCCESS('Knowledge items and images migrated successfully.'))
     
     def migrate_knowledge_items(self, source_back_url, source_kb_name, destination_base, starting_offset, batch_size, header):
         '''

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,7 @@ async function initKIReview() {`
`72`	`72`	`reviewedKIs.value.kis.push(ki)`
`73`	`73`	`}`
`74`	`74`	`review.value = await itemsStore.retrieveItems($axios, "/back/api/broker/admin-review/", {message: props.message.id, limit: 0, offset: 0, ordering: undefined}, false, true) \|\| {}`
`75`		`- ki_choices.value = await itemsStore.retrieveItems($axios, "/back/api/language-model/knowledge-items/", {`
`76`		`- knowledge_base: references.knowledge_base_id`
`77`		`- }, {knowledge_base__id: references.knowledge_base_id, limit: 0, offset: 0, ordering: undefined}, false)`
	`75`	`+ ki_choices.value = (await itemsStore.retrieveItems($axios, "/back/api/language-model/knowledge-items/", {knowledge_base: references.knowledge_base_id, knowledge_base__id: references.knowledge_base_id, limit: 0, offset: 0, ordering: undefined}, false)).results`
`78`	`76`	`itemsStore.loading = false`
`79`	`77`	`}`
`80`	`78`
`@@ -141,7 +139,7 @@ function addAlternativeKI() {`
`141`	`139`	`ki_review_data: []`
`142`	`140`	`}`
`143`	`141`	`}`
`144`		`- return review.value.ki_review_data.push({`
	`142`	`+ review.value.ki_review_data.push({`
`145`	`143`	`value: "alternative",`
`146`	`144`	`knowledge_item_id: null,`
`147`	`145`	`})`