Skip to content
Snippets Groups Projects
Unverified Commit d476c7ad authored by Roeland Jago Douma's avatar Roeland Jago Douma Committed by GitHub
Browse files

Merge pull request #20867 from nextcloud/warnigns/js/workflowengine

Fix linter warnings in workflowengine
parents 02b14209 e3bb6b69
No related branches found
No related tags found
No related merge requests found
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
<script> <script>
import Multiselect from '@nextcloud/vue/dist/Components/Multiselect' import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
import valueMixin from './../../mixins/valueMixin' import valueMixin from './../../mixins/valueMixin'
import { imagePath } from '@nextcloud/router'
export default { export default {
name: 'FileMimeType', name: 'FileMimeType',
...@@ -76,12 +77,12 @@ export default { ...@@ -76,12 +77,12 @@ export default {
pattern: '/image\\/.*/', pattern: '/image\\/.*/',
}, },
{ {
iconUrl: OC.imagePath('core', 'filetypes/x-office-document'), iconUrl: imagePath('core', 'filetypes/x-office-document'),
label: t('workflowengine', 'Office documents'), label: t('workflowengine', 'Office documents'),
pattern: '/(vnd\\.(ms-|openxmlformats-).*)$/', pattern: '/(vnd\\.(ms-|openxmlformats-).*)$/',
}, },
{ {
iconUrl: OC.imagePath('core', 'filetypes/application-pdf'), iconUrl: imagePath('core', 'filetypes/application-pdf'),
label: t('workflowengine', 'PDF documents'), label: t('workflowengine', 'PDF documents'),
pattern: 'application/pdf', pattern: 'application/pdf',
}, },
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
<script> <script>
import Multiselect from '@nextcloud/vue/dist/Components/Multiselect' import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
import axios from '@nextcloud/axios' import axios from '@nextcloud/axios'
import { generateOcsUrl } from '@nextcloud/router'
const groups = [] const groups = []
const status = { const status = {
...@@ -83,7 +84,7 @@ export default { ...@@ -83,7 +84,7 @@ export default {
} }
this.status.isLoading = true 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) => { response.data.ocs.data.groups.reduce((obj, item) => {
obj.push({ obj.push({
id: item, id: item,
......
...@@ -21,11 +21,12 @@ ...@@ -21,11 +21,12 @@
*/ */
import { loadState } from '@nextcloud/initial-state' import { loadState } from '@nextcloud/initial-state'
import { generateOcsUrl } from '@nextcloud/router'
const scopeValue = loadState('workflowengine', 'scope') === 0 ? 'global' : 'user' const scopeValue = loadState('workflowengine', 'scope') === 0 ? 'global' : 'user'
const getApiUrl = (url) => { 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 { export {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment