Verified Commit f2dfe9b9 authored by Damien's avatar Damien

FEAT #11691 TIME 0:10 Merge data fix

parent d68798dc
......@@ -245,7 +245,7 @@ class JnlpController
$dataToMerge = ['userId' => $GLOBALS['id']];
if (!empty($queryParams['objectTable'])) {
$decodedData = urldecode(json_decode($queryParams['objectTable'], true));
$decodedData = json_decode(urldecode($queryParams['objectTable']), true);
$dataToMerge = array_merge($dataToMerge, $decodedData);
}
$mergedDocument = MergeController::mergeDocument([
......
......@@ -366,7 +366,7 @@ export class DocumentViewerComponent implements OnInit {
event[0]
]
}
}
};
this.uploadTrigger(fileInput);
}
......@@ -475,7 +475,7 @@ export class DocumentViewerComponent implements OnInit {
objectType: 'resourceCreation',
objectId: template.id,
cookie: document.cookie
}
};
this.http.post('../../rest/jnlp', jnlp).pipe(
tap((data: any) => {
window.location.href = '../../rest/jnlp/' + data.generatedJnlp;
......@@ -520,7 +520,7 @@ export class DocumentViewerComponent implements OnInit {
arrTypes = this.sortPipe.transform(arrTypes, 'label');
});
}),
exhaustMap(() => this.http.get('../../rest/currentUser/templates')),
exhaustMap(() => this.http.get('../../rest/currentUser/templates?target=attachments&type=office')),
tap((data: any) => {
this.listTemplates = data.templates;
......@@ -552,4 +552,4 @@ export class DocumentViewerComponent implements OnInit {
).subscribe();
}
}
}
\ No newline at end of file
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment