Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wsd: presets: pass xcu as json array instead of json object #11011

Merged
merged 1 commit into from
Jan 27, 2025

Conversation

Rash419
Copy link
Contributor

@Rash419 Rash419 commented Jan 24, 2025

  • this is done to make the json format consistent
  • json format after this change
{
  "autotext": [
    {
      "stamp": "\"780e98110c\"",
      "uri": "https://localhost:9980/wopi/settings/home/rashesh/work/collabora/online/master//test/data/presets/user/autotextuser.bau"
    }
  ],
  "browsersetting": [
    {
      "stamp": "\"780e98110c\"",
      "uri": "https://localhost:9980/wopi/settings/home/rashesh/work/collabora/online/master/test/data/presets/user/browsersetting.json"
    }
  ],
  "kind": "user",
  "wordbook": [
    {
      "stamp": "\"780e98110c\"",
      "uri": "https://localhost:9980/wopi/settings/home/rashesh/work/collabora/online/master//test/data/presets/user/dictionaryuser.dic"
    }
  ],
  "xcu": [
    {
      "stamp": "\"780e98110c\"",
      "uri": "https://localhost:9980/wopi/settings/home/rashesh/work/collabora/online/master//test/data/presets/user/configuser.xcu"
    }
  ]
}

Change-Id: I37058c647eea6f6d17ef76cde99c79a73273ea53

@Rash419 Rash419 requested a review from caolanm January 24, 2025 11:55
Copy link
Contributor

@caolanm caolanm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fine by me

@caolanm
Copy link
Contributor

caolanm commented Jan 24, 2025

conflict here apparently

- this is done to make the json format consistent
- json format after this change
```json
{
  "autotext": [
    {
      "stamp": "\"780e98110c\"",
      "uri": "https://localhost:9980/wopi/settings/home/rashesh/work/collabora/online/master//test/data/presets/user/autotextuser.bau"
    }
  ],
  "browsersetting": [
    {
      "stamp": "\"780e98110c\"",
      "uri": "https://localhost:9980/wopi/settings/home/rashesh/work/collabora/online/master/test/data/presets/user/browsersetting.json"
    }
  ],
  "kind": "user",
  "wordbook": [
    {
      "stamp": "\"780e98110c\"",
      "uri": "https://localhost:9980/wopi/settings/home/rashesh/work/collabora/online/master//test/data/presets/user/dictionaryuser.dic"
    }
  ],
  "xcu": [
    {
      "stamp": "\"780e98110c\"",
      "uri": "https://localhost:9980/wopi/settings/home/rashesh/work/collabora/online/master//test/data/presets/user/configuser.xcu"
    }
  ]
}
```

Signed-off-by: Rashesh <[email protected]>
Change-Id: I37058c647eea6f6d17ef76cde99c79a73273ea53
@caolanm caolanm merged commit 454a874 into CollaboraOnline:master Jan 27, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants