diff options
author | Carl Schwan <carl@carlschwan.eu> | 2022-05-23 15:53:56 +0300 |
---|---|---|
committer | Carl Schwan <carl@carlschwan.eu> | 2022-05-24 11:12:18 +0300 |
commit | 6d883a8572bb26c55d419afaf46f889419f325b3 (patch) | |
tree | 9b25ae5182c3b60615e70d95c09899c090385274 /apps/settings | |
parent | 45a75c631e638ccab8934584aedad834229d10a7 (diff) |
Fix various errors reported by eslint
And also make sure eslint doesn't try to index apps-extra that contains
other repo with not necessarely the same eslint rules
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Diffstat (limited to 'apps/settings')
-rw-r--r-- | apps/settings/src/admin.js | 8 | ||||
-rw-r--r-- | apps/settings/src/apps.js | 2 | ||||
-rw-r--r-- | apps/settings/src/components/BasicSettings/BackgroundJob.vue | 17 |
3 files changed, 13 insertions, 14 deletions
diff --git a/apps/settings/src/admin.js b/apps/settings/src/admin.js index 833ed3e1ea9..eadc91c1759 100644 --- a/apps/settings/src/admin.js +++ b/apps/settings/src/admin.js @@ -117,7 +117,7 @@ window.addEventListener('DOMContentLoaded', () => { }, error: () => { OC.msg.finishedError('#publicShareDisclaimerStatus', t('settings', 'Not saved')) - } + }, } OC.msg.startSaving('#publicShareDisclaimerStatus') @@ -194,7 +194,7 @@ window.addEventListener('DOMContentLoaded', () => { }, error: (xhr) => { OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON) - } + }, }) } @@ -214,7 +214,7 @@ window.addEventListener('DOMContentLoaded', () => { }, error: (xhr) => { OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON) - } + }, }) } @@ -239,7 +239,7 @@ window.addEventListener('DOMContentLoaded', () => { }, error: (xhr) => { OC.msg.finishedError('#sendtestmail_msg', xhr.responseJSON) - } + }, }) }) diff --git a/apps/settings/src/apps.js b/apps/settings/src/apps.js index fafdb531399..61eea28f9d9 100644 --- a/apps/settings/src/apps.js +++ b/apps/settings/src/apps.js @@ -2,5 +2,5 @@ import rebuildNavigation from './service/rebuild-navigation.js' window.OC.Settings = window.OC.Settings || {} window.OC.Settings.Apps = window.OC.Settings.Apps || { - rebuildNavigation + rebuildNavigation, } diff --git a/apps/settings/src/components/BasicSettings/BackgroundJob.vue b/apps/settings/src/components/BasicSettings/BackgroundJob.vue index 5413db38f91..a785d585228 100644 --- a/apps/settings/src/components/BasicSettings/BackgroundJob.vue +++ b/apps/settings/src/components/BasicSettings/BackgroundJob.vue @@ -24,7 +24,6 @@ <SettingsSection :title="t('settings', 'Background jobs')" :description="t('settings', `For the server to work properly, it's important to configure background jobs correctly. Cron is the recommended setting. Please see the documentation for more information.`)" :doc-url="backgroundJobsDocUrl"> - <template v-if="lastCron !== 0"> <span v-if="oldExecution" class="error"> {{ t('settings', 'Last job execution ran {time}. Something seems wrong.', {time: relativeTime}) }} @@ -34,7 +33,7 @@ {{ t('settings', "Some jobs haven’t been executed since {maxAgeRelativeTime}. Please consider increasing the execution frequency.", {maxAgeRelativeTime}) }} </span> - <span class="warning" v-else-if="longExecutionCron"> + <span v-else-if="longExecutionCron" class="warning"> {{ t('settings', "Some jobs haven’t been executed since {maxAgeRelativeTime}. Please consider switching to system cron.", {maxAgeRelativeTime}) }} </span> @@ -43,7 +42,7 @@ </span> </template> - <span class="error" v-else> + <span v-else class="error"> {{ t('settings', 'Background job didn’t run yet!') }} </span> @@ -66,11 +65,11 @@ </CheckboxRadioSwitch> <em>{{ t('settings', 'cron.php is registered at a webcron service to call cron.php every 5 minutes over HTTP. Use case: Very small instance (1–5 users depending on the usage).') }}</em> - <CheckboxRadioSwitch type="radio" + <CheckboxRadioSwitch v-if="cliBasedCronPossible" + type="radio" :checked.sync="backgroundJobsMode" value="cron" name="backgroundJobsMode" - v-if="cliBasedCronPossible" @update:checked="onBackgroundJobModeChanged"> {{ t('settings', 'Cron (Recommended)') }} </CheckboxRadioSwitch> @@ -137,7 +136,7 @@ export default { }, longExecutionCron() { return Date.now() / 1000 - this.cronMaxAge > 12 * 3600 && this.backgroundJobsMode === 'cron' - } + }, }, methods: { async onBackgroundJobModeChanged(backgroundJobsMode) { @@ -150,10 +149,10 @@ export default { try { const { data } = await axios.post(url, { - value: backgroundJobsMode + value: backgroundJobsMode, }) this.handleResponse({ - status: data.ocs?.meta?.status + status: data.ocs?.meta?.status, }) } catch (e) { this.handleResponse({ @@ -184,7 +183,7 @@ export default { } catch (error) { console.error(error) } - } + }, }, } </script> |