mirror of https://github.com/nextcloud/server
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>
This commit is contained in:
parent
45a75c631e
commit
6d883a8572
|
@ -6,6 +6,7 @@ node_modules/
|
|||
**/js/*
|
||||
*.config.js
|
||||
tests/lib/
|
||||
apps-extra
|
||||
|
||||
# TODO: remove when comments files is not using handlebar templates anymore
|
||||
apps/comments/src/templates.js
|
|
@ -124,6 +124,6 @@ export default {
|
|||
console.error(errorMessage, error)
|
||||
}
|
||||
},
|
||||
}
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
},
|
||||
})
|
||||
})
|
||||
|
||||
|
|
|
@ -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,
|
||||
}
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -52,7 +52,7 @@
|
|||
// done if handling the event with the file list already
|
||||
// created.
|
||||
shown: true,
|
||||
systemTagIds: initialTags
|
||||
systemTagIds: initialTags,
|
||||
}
|
||||
)
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue