diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2020-05-07 21:27:35 +0200 |
|---|---|---|
| committer | npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com> | 2020-05-07 19:39:24 +0000 |
| commit | e3bb6b69eab9184093e68660f2ccf062bb7832d6 (patch) | |
| tree | 913dbb75b0ecf6bbb34bfb1b63b026fea362fdcc /apps/workflowengine/src | |
| parent | ab54225eda6db7f92ab6c7fae0589d5700d3e8dc (diff) | |
| download | nextcloud-server-e3bb6b69eab9184093e68660f2ccf062bb7832d6.tar.gz nextcloud-server-e3bb6b69eab9184093e68660f2ccf062bb7832d6.zip | |
Fix linter warnings in workflowengine
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
Diffstat (limited to 'apps/workflowengine/src')
| -rw-r--r-- | apps/workflowengine/src/components/Checks/FileMimeType.vue | 5 | ||||
| -rw-r--r-- | apps/workflowengine/src/components/Checks/RequestUserGroup.vue | 3 | ||||
| -rw-r--r-- | apps/workflowengine/src/helpers/api.js | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/apps/workflowengine/src/components/Checks/FileMimeType.vue b/apps/workflowengine/src/components/Checks/FileMimeType.vue index 7f1f6567298..e27481ec4d0 100644 --- a/apps/workflowengine/src/components/Checks/FileMimeType.vue +++ b/apps/workflowengine/src/components/Checks/FileMimeType.vue @@ -53,6 +53,7 @@ <script> import Multiselect from '@nextcloud/vue/dist/Components/Multiselect' import valueMixin from './../../mixins/valueMixin' +import { imagePath } from '@nextcloud/router' export default { name: 'FileMimeType', @@ -76,12 +77,12 @@ export default { pattern: '/image\\/.*/', }, { - iconUrl: OC.imagePath('core', 'filetypes/x-office-document'), + iconUrl: imagePath('core', 'filetypes/x-office-document'), label: t('workflowengine', 'Office documents'), pattern: '/(vnd\\.(ms-|openxmlformats-).*)$/', }, { - iconUrl: OC.imagePath('core', 'filetypes/application-pdf'), + iconUrl: imagePath('core', 'filetypes/application-pdf'), label: t('workflowengine', 'PDF documents'), pattern: 'application/pdf', }, diff --git a/apps/workflowengine/src/components/Checks/RequestUserGroup.vue b/apps/workflowengine/src/components/Checks/RequestUserGroup.vue index 897a6ea5f4d..e053ab20a58 100644 --- a/apps/workflowengine/src/components/Checks/RequestUserGroup.vue +++ b/apps/workflowengine/src/components/Checks/RequestUserGroup.vue @@ -36,6 +36,7 @@ <script> import Multiselect from '@nextcloud/vue/dist/Components/Multiselect' import axios from '@nextcloud/axios' +import { generateOcsUrl } from '@nextcloud/router' const groups = [] const status = { @@ -83,7 +84,7 @@ export default { } this.status.isLoading = true - return axios.get(OC.linkToOCS('cloud', 2) + 'groups?limit=20&search=' + encodeURI(searchQuery)).then((response) => { + return axios.get(generateOcsUrl('cloud', 2) + 'groups?limit=20&search=' + encodeURI(searchQuery)).then((response) => { response.data.ocs.data.groups.reduce((obj, item) => { obj.push({ id: item, diff --git a/apps/workflowengine/src/helpers/api.js b/apps/workflowengine/src/helpers/api.js index c8a019de625..59e0248ed60 100644 --- a/apps/workflowengine/src/helpers/api.js +++ b/apps/workflowengine/src/helpers/api.js @@ -21,11 +21,12 @@ */ import { loadState } from '@nextcloud/initial-state' +import { generateOcsUrl } from '@nextcloud/router' const scopeValue = loadState('workflowengine', 'scope') === 0 ? 'global' : 'user' const getApiUrl = (url) => { - return OC.linkToOCS('apps/workflowengine/api/v1/workflows', 2) + scopeValue + url + '?format=json' + return generateOcsUrl('apps/workflowengine/api/v1/workflows', 2) + scopeValue + url + '?format=json' } export { |