Skip to content

[stable8.9] fix: switches in admin settings panel #5747

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.

Sign up for GitHub

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

Merged
hamza221 merged 1 commit into from
Sep 30, 2026
Merged

[stable8.9] fix: switches in admin settings panel #5747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/Settings/AdminSettings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Services\IInitialState;
use OCP\Settings\ISettings;
use OCP\Util;

class AdminSettings implements ISettings {
public function __construct(
Expand All @@ -26,6 +27,9 @@ public function __construct(
public function getForm() {
$this->initialState->provideInitialState('allowSocialSync', $this->socialApiService->syncAllowedByAdmin());
$this->initialState->provideInitialState('ocmInvitesConfig', $this->federatedInvitesService->getOcmInvitesConfig());

Util::addScript(Application::APP_ID, 'contacts-admin-settings');
Util::addStyle(Application::APP_ID, 'contacts-admin-settings');
return new TemplateResponse(Application::APP_ID, 'settings/admin');
}

Expand Down
12 changes: 2 additions & 10 deletions src/admin-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,6 @@

import { createApp } from 'vue'
import AdminSettings from './components/AdminSettings.vue'
import LegacyGlobalMixin from './mixins/LegacyGlobalMixin.js'

import 'vite/modulepreload-polyfill'

document.addEventListener('DOMContentLoaded', main)

function main() {
const app = createApp(AdminSettings)
app.mixin(LegacyGlobalMixin)
app.mount('#contacts-settings')
}
const app = createApp(AdminSettings)
app.mount('#contacts-settings')
44 changes: 26 additions & 18 deletions src/components/AdminSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,57 @@
-->

<template>
<div id="contacts" class="section">
<h2>{{ t('contacts', 'Contacts') }}</h2>
<NcSettingsSection :name="t('contacts', 'Contacts')">
<p>
<input
<NcCheckboxRadioSwitch
id="allow-social-sync"
v-model="allowSocialSync"
type="checkbox"
class="checkbox"
@change="updateSocialSetting('allowSocialSync')">
<label for="allow-social-sync">{{ t('contacts', 'Allow updating avatars from social media') }}</label>
type="switch"
@update:model-value="updateSocialSetting('allowSocialSync')">
{{ t('contacts', 'Allow updating avatars from social media') }}
</NcCheckboxRadioSwitch>
</p>

<h3>{{ t('contacts', 'External invitations') }}</h3>
<p>
<input
<NcCheckboxRadioSwitch
id="ocm-invites-optional-mail"
v-model="ocmInvitesConfig.optionalMail"
type="checkbox"
class="checkbox"
@change="updateOcmSetting(ocmInviteConfigKeys.optionalMail, ocmInvitesConfig.optionalMail)">
<label for="ocm-invites-optional-mail">{{ t('contacts', 'Allow creating invites without an email address (link-only)') }}</label>
type="switch"
@update:model-value="updateOcmSetting(ocmInviteConfigKeys.optionalMail, ocmInvitesConfig.optionalMail)">
{{ t('contacts', 'Allow creating invites without an email address (link-only)') }}
</NcCheckboxRadioSwitch>
</p>
<p>
<input
<NcCheckboxRadioSwitch
id="ocm-invites-encoded-copy-button"
v-model="ocmInvitesConfig.encodedCopyButton"
type="checkbox"
class="checkbox"
@change="updateOcmSetting(ocmInviteConfigKeys.encodedCopyButton, ocmInvitesConfig.encodedCopyButton)">
<label for="ocm-invites-encoded-copy-button">{{ t('contacts', 'Show the "Copy encoded invite" button on invite details') }}</label>
type="switch"
@update:model-value="updateOcmSetting(ocmInviteConfigKeys.encodedCopyButton, ocmInvitesConfig.encodedCopyButton)">
{{ t('contacts', 'Show the "Copy encoded invite" button on invite details') }}
</NcCheckboxRadioSwitch>
</p>
</div>
</NcSettingsSection>
</template>

<script>
import axios from '@nextcloud/axios'
import { showError } from '@nextcloud/dialogs'
import { loadState } from '@nextcloud/initial-state'
import { generateUrl } from '@nextcloud/router'
import { NcCheckboxRadioSwitch, NcSettingsSection } from '@nextcloud/vue'
import LegacyGlobalMixin from '../mixins/LegacyGlobalMixin.js'
import { OCM_INVITES_CONFIG_KEYS } from '../models/constants.ts'

export default {
name: 'AdminSettings',
components: {
NcCheckboxRadioSwitch,
NcSettingsSection,
},

mixins: [LegacyGlobalMixin],

data() {
return {
allowSocialSync: loadState('contacts', 'allowSocialSync', true),
Expand Down
4 changes: 0 additions & 4 deletions templates/settings/admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

// TODO: uncomment once there are custom styles in the admin settings entrypoint
// style('contacts', 'contacts-index');
// style('contacts', 'contacts-admin-settings');
script('contacts', 'contacts-admin-settings');
?>

<div id="contacts-settings"></div>
Loading