mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Fix linter warnings in workflowengine
This commit is contained in:
Roeland Jago Douma 2020-05-08 10:05:53 +02:00 committed by GitHub
parent 02b142094f e3bb6b69ea
commit d476c7adab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
apps/workflowengine/js/workflowengine.js
View File

File diff suppressed because one or more lines are too long

2
apps/workflowengine/js/workflowengine.js.map
View File

File diff suppressed because one or more lines are too long

5
apps/workflowengine/src/components/Checks/FileMimeType.vue
View File

@ -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',
},

3
apps/workflowengine/src/components/Checks/RequestUserGroup.vue
View File

@ -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,

3
apps/workflowengine/src/helpers/api.js
View File

@ -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 {