Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions apps/files_sharing/src/components/SharingEntry.vue
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
{{ t('files_sharing', 'Allow resharing') }}
</NcActionCheckbox>

<NcActionCheckbox ref="canDownload"
<NcActionCheckbox v-if="isSetDownloadButtonVisible"
ref="canDownload"
:checked.sync="canDownload"
v-if="isSetDownloadButtonVisible"
:disabled="saving || !canSetDownload">
{{ allowDownloadText }}
</NcActionCheckbox>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,12 @@

<template>
<div class="checkbox-container">
<input id="enable-profile"
class="checkbox"
type="checkbox"
:checked="profileEnabled"
@change="onEnableProfileChange">
<label for="enable-profile">
<NcCheckboxRadioSwitch type="switch"
:checked.sync="isProfileEnabled"
:loading="loading"
@update:checked="saveEnableProfile">
{{ t('settings', 'Enable Profile') }}
</label>
</NcCheckboxRadioSwitch>
</div>
</template>

Expand All @@ -38,13 +36,17 @@ import { showError } from '@nextcloud/dialogs'
import { emit } from '@nextcloud/event-bus'

import { savePrimaryAccountProperty } from '../../../service/PersonalInfo/PersonalInfoService.js'
import { validateBoolean } from '../../../utils/validate.js'
import { ACCOUNT_PROPERTY_ENUM } from '../../../constants/AccountPropertyConstants.js'
import logger from '../../../logger.js'
import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'

export default {
name: 'ProfileCheckbox',

components: {
NcCheckboxRadioSwitch,
},

props: {
profileEnabled: {
type: Boolean,
Expand All @@ -54,25 +56,18 @@ export default {

data() {
return {
initialProfileEnabled: this.profileEnabled,
isProfileEnabled: this.profileEnabled,
loading: false,
}
},

methods: {
async onEnableProfileChange(e) {
const isEnabled = e.target.checked
this.$emit('update:profile-enabled', isEnabled)

if (validateBoolean(isEnabled)) {
await this.updateEnableProfile(isEnabled)
}
},

async updateEnableProfile(isEnabled) {
async saveEnableProfile() {
this.loading = true
try {
const responseData = await savePrimaryAccountProperty(ACCOUNT_PROPERTY_ENUM.PROFILE_ENABLED, isEnabled)
const responseData = await savePrimaryAccountProperty(ACCOUNT_PROPERTY_ENUM.PROFILE_ENABLED, this.isProfileEnabled)
this.handleResponse({
isEnabled,
isProfileEnabled: this.isProfileEnabled,
status: responseData.ocs?.meta?.status,
})
} catch (e) {
Expand All @@ -83,19 +78,15 @@ export default {
}
},

handleResponse({ isEnabled, status, errorMessage, error }) {
handleResponse({ isProfileEnabled, status, errorMessage, error }) {
if (status === 'ok') {
// Ensure that local state reflects server state
this.initialProfileEnabled = isEnabled
emit('settings:profile-enabled:updated', isEnabled)
emit('settings:profile-enabled:updated', isProfileEnabled)
} else {
showError(errorMessage)
logger.error(errorMessage, error)
}
this.loading = false
},
},
}
</script>

<style lang="scss" scoped>
</style>
4 changes: 2 additions & 2 deletions apps/user_status/src/components/CustomMessageInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
<label class="hidden-visually" for="user_status_message">
{{ t('user_status', 'What is your status?') }}
</label>
<input ref="input"
id="user_status_message"
<input id="user_status_message"
ref="input"
maxlength="80"
:disabled="disabled"
:placeholder="$t('user_status', 'What is your status?')"
Expand Down
4 changes: 2 additions & 2 deletions dist/files_sharing-files_sharing_tab.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files_sharing-files_sharing_tab.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-personal-info.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-personal-info.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/user-status-modal-8299.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/user-status-modal-8299.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/user_status-menu.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/user_status-menu.js.map

Large diffs are not rendered by default.