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

Merge pull request #21257 from nextcloud/td/js/systemtags_linter 

Fix linting on systemtags and use @nextcloud/router
This commit is contained in:
Roeland Jago Douma 2020-06-06 09:29:42 +02:00 committed by GitHub
parent 4cf4ed3697 6949c29586
commit 00fa50a1dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/js/dist/systemtags.js vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/systemtags.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
core/src/systemtags/systemtagmodel.js
View File

@ -11,10 +11,10 @@
(function(OC) {
_.extend(OC.Files.Client, {
PROPERTY_FILEID: '{' + OC.Files.Client.NS_OWNCLOUD + '}id',
PROPERTY_FILEID: '{' + OC.Files.Client.NS_OWNCLOUD + '}id',
PROPERTY_CAN_ASSIGN: '{' + OC.Files.Client.NS_OWNCLOUD + '}can-assign',
PROPERTY_DISPLAYNAME: '{' + OC.Files.Client.NS_OWNCLOUD + '}display-name',
PROPERTY_USERVISIBLE: '{' + OC.Files.Client.NS_OWNCLOUD + '}user-visible',
PROPERTY_DISPLAYNAME: '{' + OC.Files.Client.NS_OWNCLOUD + '}display-name',
PROPERTY_USERVISIBLE: '{' + OC.Files.Client.NS_OWNCLOUD + '}user-visible',
PROPERTY_USERASSIGNABLE: '{' + OC.Files.Client.NS_OWNCLOUD + '}user-assignable',
})
@ -36,7 +36,7 @@
},
davProperties: {
'id': OC.Files.Client.PROPERTY_FILEID,
'id': OC.Files.Client.PROPERTY_FILEID,
'name': OC.Files.Client.PROPERTY_DISPLAYNAME,
'userVisible': OC.Files.Client.PROPERTY_USERVISIBLE,
'userAssignable': OC.Files.Client.PROPERTY_USERASSIGNABLE,

4
core/src/systemtags/systemtagsmappingcollection.js
View File

@ -8,6 +8,8 @@
*
*/
import { generateRemoteUrl } from '@nextcloud/router'
(function(OC) {
/**
* @class OC.SystemTags.SystemTagsMappingCollection
@ -43,7 +45,7 @@
model: OC.SystemTags.SystemTagModel,
url: function() {
return OC.linkToRemote('dav') + '/systemtags-relations/' + this._objectType + '/' + this._objectId
return generateRemoteUrl('dav') + '/systemtags-relations/' + this._objectType + '/' + this._objectId
},
/**