mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-05 16:07:34 +02:00
Code Issues Releases Wiki Activity

fix: allow use of an attribute named relationships

Browse Source
This commit is contained in:
Sami Mazouz
2024-10-25 15:50:36 +01:00
parent 53ac644516
commit 1ead69e9b6
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/js/src/common/Application.tsx
View File

@@ -671,7 +671,7 @@ export default class Application {
* @protected * @protected
*/ */
protected requestWasCrossOrigin(error: RequestError): boolean { protected requestWasCrossOrigin(error: RequestError): boolean {
return new URL(error.options.url, document.baseURI).origin !== window.location.origin; return new URL(error.options?.url, document.baseURI).origin !== window.location.origin;
} }
protected requestErrorDefaultHandler(e: unknown, isDebug: boolean, formattedErrors: string[]): void { protected requestErrorDefaultHandler(e: unknown, isDebug: boolean, formattedErrors: string[]): void {

5
framework/core/js/src/common/Model.ts
View File

@@ -192,7 +192,8 @@ export default abstract class Model {
// If a 'relationships' key exists, extract it from the attributes hash and // If a 'relationships' key exists, extract it from the attributes hash and
// set it on the top-level data object instead. We will be sending this data // set it on the top-level data object instead. We will be sending this data
// object to the API for persistence. // object to the API for persistence.
if (attributes.relationships) { // But only if the model does not actually have a real relationships attribute.
if (attributes.relationships && !('relationships' in this)) {
data.relationships = {}; data.relationships = {};
for (const key in attributes.relationships) { for (const key in attributes.relationships) {
@@ -208,6 +209,8 @@ export default abstract class Model {
delete attributes.relationships; delete attributes.relationships;
} }
console.log('data', data);
// Before we update the model's data, we should make a copy of the model's // Before we update the model's data, we should make a copy of the model's
// old data so that we can revert back to it if something goes awry during // old data so that we can revert back to it if something goes awry during
// persistence. // persistence.