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

Merge pull request #10816 from nextcloud/backport/10700+10815/stable13 

[stable13] remove unexecutable code
This commit is contained in:
Morris Jobke 2018-08-23 14:58:29 +02:00 committed by GitHub
parent 112719f457 f404695602
commit 893cccba68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/files_sharing/js/sharedfilelist.js
View File

@ -154,24 +154,8 @@
}, },
updateRow: function($tr, fileInfo, options) { updateRow: function($tr, fileInfo, options) {
if(!fileInfo instanceof OCA.Sharing.SharedFileInfo) { // no-op, suppress re-rendering
// recycle SharedFileInfo values if something tries to overwrite it return $tr;
var oldModel = this.getModelForFile($tr);
if(_.isUndefined(fileInfo.recipientData) && oldModel.recipientData) {
fileInfo.recipientData = oldModel.recipientData;
}
if(_.isUndefined(fileInfo.recipients) && oldModel.recipientData) {
fileInfo.recipientData = oldModel.recipientData;
}
if(_.isUndefined(fileInfo.shares) && oldModel.shares) {
fileInfo.shares = oldModel.shares;
}
if(_.isUndefined(fileInfo.shareOwner) && oldModel.shareOwner) {
fileInfo.shareOwner = oldModel.shareOwner;
}
}
OCA.Files.FileList.prototype._createRow.updateRow(this, arguments);
}, },
reload: function() { reload: function() {