Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2022-05-24 16:10:42 +0300
committerGitHub <noreply@github.com>2022-05-24 16:10:42 +0300
commit53577ab34ae3e59b62fb57d35112b8f8d49d6de3 (patch)
tree957a0dc671177072db98c9ca260eef501057e5d3 /apps
parentcc38424179ff0fe0629e71a834a697250549ae89 (diff)
parent6d883a8572bb26c55d419afaf46f889419f325b3 (diff)
Merge pull request #32558 from nextcloud/fix/eslint
Diffstat (limited to 'apps')
-rw-r--r--apps/federatedfilesharing/src/components/AdminSettings.vue2
-rw-r--r--apps/settings/src/admin.js8
-rw-r--r--apps/settings/src/apps.js2
-rw-r--r--apps/settings/src/components/BasicSettings/BackgroundJob.vue17
-rw-r--r--apps/sharebymail/src/components/AdminSettings.vue4
-rw-r--r--apps/systemtags/src/app.js2
-rw-r--r--apps/user_status/src/menu.js2
7 files changed, 18 insertions, 19 deletions
diff --git a/apps/federatedfilesharing/src/components/AdminSettings.vue b/apps/federatedfilesharing/src/components/AdminSettings.vue
index cd0f6e5beb6..b3fb2a7675b 100644
--- a/apps/federatedfilesharing/src/components/AdminSettings.vue
+++ b/apps/federatedfilesharing/src/components/AdminSettings.vue
@@ -124,6 +124,6 @@ export default {
console.error(errorMessage, error)
}
},
- }
+ },
}
</script>
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>
diff --git a/apps/sharebymail/src/components/AdminSettings.vue b/apps/sharebymail/src/components/AdminSettings.vue
index 29b7f051a4b..c84ded9bb2a 100644
--- a/apps/sharebymail/src/components/AdminSettings.vue
+++ b/apps/sharebymail/src/components/AdminSettings.vue
@@ -71,7 +71,7 @@ export default {
value: stringValue,
})
this.handleResponse({
- status: data.ocs?.meta?.status
+ status: data.ocs?.meta?.status,
})
} catch (e) {
this.handleResponse({
@@ -86,6 +86,6 @@ export default {
console.error(errorMessage, error)
}
},
- }
+ },
}
</script>
diff --git a/apps/systemtags/src/app.js b/apps/systemtags/src/app.js
index e7e5fea5372..9696f1edbad 100644
--- a/apps/systemtags/src/app.js
+++ b/apps/systemtags/src/app.js
@@ -52,7 +52,7 @@
// done if handling the event with the file list already
// created.
shown: true,
- systemTagIds: initialTags
+ systemTagIds: initialTags,
}
)
diff --git a/apps/user_status/src/menu.js b/apps/user_status/src/menu.js
index c8d007d98a0..19d21939544 100644
--- a/apps/user_status/src/menu.js
+++ b/apps/user_status/src/menu.js
@@ -41,7 +41,7 @@ const propsData = {
preloadedUserStatus: {
message: userStatusData.message,
icon: userStatusData.icon,
- status: userStatusData.status
+ status: userStatusData.status,
},
user: avatarDiv.dataset.user,
displayName: avatarDiv.dataset.displayname,