diff options
| author | Robin Appelman <robin@icewind.nl> | 2019-06-19 14:49:55 +0200 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2019-06-19 15:09:56 +0200 |
| commit | 9b8f2f41927374e32ff9ff9f3b64d29256155046 (patch) | |
| tree | 05036095db0424533b67b877d3eb482b64b2d316 /apps/files_versions/src | |
| parent | 817bdc47c804ae8511ad3423eae216f6ccdee6c6 (diff) | |
| download | nextcloud-server-9b8f2f41927374e32ff9ff9f3b64d29256155046.tar.gz nextcloud-server-9b8f2f41927374e32ff9ff9f3b64d29256155046.zip | |
fix previews and rollback of versions with non numeric version ids
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'apps/files_versions/src')
| -rw-r--r-- | apps/files_versions/src/templates/item.handlebars | 2 | ||||
| -rw-r--r-- | apps/files_versions/src/versioncollection.js | 2 | ||||
| -rw-r--r-- | apps/files_versions/src/versionmodel.js | 2 | ||||
| -rw-r--r-- | apps/files_versions/src/versionstabview.js | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_versions/src/templates/item.handlebars b/apps/files_versions/src/templates/item.handlebars index e34be4bd025..656cab22866 100644 --- a/apps/files_versions/src/templates/item.handlebars +++ b/apps/files_versions/src/templates/item.handlebars @@ -1,4 +1,4 @@ -<li data-revision="{{timestamp}}"> +<li data-revision="{{id}}"> <div> <div class="preview-container"> <img class="preview" src="{{previewUrl}}" width="44" height="44"/> diff --git a/apps/files_versions/src/versioncollection.js b/apps/files_versions/src/versioncollection.js index e48368adfa2..2ee683b38ef 100644 --- a/apps/files_versions/src/versioncollection.js +++ b/apps/files_versions/src/versioncollection.js @@ -68,7 +68,7 @@ version.fileId = fileId; version.name = name; version.timestamp = parseInt(moment(new Date(version.timestamp)).format('X'), 10); - version.id = parseInt(OC.basename(version.href), 10); + version.id = OC.basename(version.href); version.size = parseInt(version.size, 10); version.user = user; version.client = client; diff --git a/apps/files_versions/src/versionmodel.js b/apps/files_versions/src/versionmodel.js index 15469927475..9857bf950b4 100644 --- a/apps/files_versions/src/versionmodel.js +++ b/apps/files_versions/src/versionmodel.js @@ -55,7 +55,7 @@ var url = OC.generateUrl('/apps/files_versions/preview'); var params = { file: this.get('fullPath'), - version: this.get('timestamp') + version: this.get('id') }; return url + '?' + OC.buildQueryString(params); }, diff --git a/apps/files_versions/src/versionstabview.js b/apps/files_versions/src/versionstabview.js index 464ae549218..8adfe549aa9 100644 --- a/apps/files_versions/src/versionstabview.js +++ b/apps/files_versions/src/versionstabview.js @@ -156,7 +156,7 @@ import Template from './templates/template.handlebars'; var preview = OC.MimeType.getIconUrl(version.get('mimetype')); var img = new Image(); img.onload = function () { - $('li[data-revision=' + version.get('timestamp') + '] .preview').attr('src', version.getPreviewUrl()); + $('li[data-revision=' + version.get('id') + '] .preview').attr('src', version.getPreviewUrl()); }; img.src = version.getPreviewUrl(); |