mirror of
https://github.com/sismics/docs.git
synced 2024-11-22 14:07:55 +01:00
Closes #256: display version history
This commit is contained in:
Benjamin Gamard
parent
8bdab73ae9
commit
a2a3297986
11
README.md
11
README.md
@ -32,15 +32,16 @@ Features
|
||||
- Responsive user interface
|
||||
- Optical character recognition
|
||||
- Support image, PDF, ODT, DOCX, PPTX files
|
||||
- Video file support 
|
||||
- Video file support
|
||||
- Flexible search engine with suggestions and highlighting
|
||||
- Full text search in all supported files
|
||||
- All [Dublin Core](http://dublincore.org/) metadata
|
||||
- Workflow system 
|
||||
- 256-bit AES encryption of stored files
|
||||
- File versioning 
|
||||
- Tag system with nesting
|
||||
- Import document from email (EML format) 
|
||||
- Automatic inbox scanning and importing 
|
||||
- Import document from email (EML format)
|
||||
- Automatic inbox scanning and importing
|
||||
- User/group permission system
|
||||
- 2-factor authentication
|
||||
- Hierarchical groups
|
||||
@ -49,9 +50,9 @@ Features
|
||||
- Storage quota per user
|
||||
- Document sharing by URL
|
||||
- RESTful Web API
|
||||
- Webhooks to trigger external service 
|
||||
- Webhooks to trigger external service
|
||||
- Fully featured Android client
|
||||
- [Bulk files importer](https://github.com/sismics/docs/tree/master/docs-importer) (single or scan mode) 
|
||||
- [Bulk files importer](https://github.com/sismics/docs/tree/master/docs-importer) (single or scan mode)
|
||||
- Tested to one million documents
|
||||
|
||||
Install with Docker
|
||||
|
||||
@ -64,6 +64,9 @@ angular.module('docs').controller('DocumentViewContent', function ($scope, $root
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* Upload a new version.
|
||||
*/
|
||||
$scope.uploadNewVersion = function (files, file) {
|
||||
if (!$scope.document.writable || !files || files.length === 0) {
|
||||
return;
|
||||
@ -182,4 +185,16 @@ angular.module('docs').controller('DocumentViewContent', function ($scope, $root
|
||||
file.processing = true;
|
||||
});
|
||||
};
|
||||
|
||||
$scope.openVersions = function (file) {
|
||||
$uibModal.open({
|
||||
templateUrl: 'partial/docs/file.versions.html',
|
||||
controller: 'ModalFileVersions',
|
||||
resolve: {
|
||||
file: function () {
|
||||
return file;
|
||||
}
|
||||
}
|
||||
})
|
||||
};
|
||||
});
|
||||
@ -4,17 +4,27 @@
|
||||
* File modal view controller.
|
||||
*/
|
||||
angular.module('docs').controller('FileModalView', function ($uibModalInstance, $scope, $state, $stateParams, $sce, Restangular, $transitions) {
|
||||
// Load files
|
||||
Restangular.one('file/list').get({ id: $stateParams.id }).then(function (data) {
|
||||
$scope.files = data.files;
|
||||
|
||||
var setFile = function (files) {
|
||||
// Search current file
|
||||
_.each($scope.files, function (value) {
|
||||
_.each(files, function (value) {
|
||||
if (value.id === $stateParams.fileId) {
|
||||
$scope.file = value;
|
||||
$scope.trustedFileUrl = $sce.trustAsResourceUrl('../api/file/' + $stateParams.fileId + '/data');
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
// Load files
|
||||
Restangular.one('file/list').get({ id: $stateParams.id }).then(function (data) {
|
||||
$scope.files = data.files;
|
||||
setFile(data.files);
|
||||
|
||||
// File not found, maybe it's a version
|
||||
if (!$scope.file) {
|
||||
Restangular.one('file/' + $stateParams.fileId + '/versions').get().then(function (data) {
|
||||
setFile(data.files);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* Modal file versions controller.
|
||||
*/
|
||||
angular.module('docs').controller('ModalFileVersions', function ($scope, $state, $stateParams, $uibModalInstance, Restangular, file) {
|
||||
Restangular.one('file/' + file.id + '/versions').get().then(function (data) {
|
||||
$scope.files = data.files;
|
||||
});
|
||||
|
||||
$scope.openFile = function (file) {
|
||||
$state.go('document.view.content.file', { id: $stateParams.id, fileId: file.id })
|
||||
};
|
||||
|
||||
$scope.close = function() {
|
||||
$uibModalInstance.close();
|
||||
};
|
||||
});
|
||||
@ -72,6 +72,7 @@
|
||||
<script src="app/docs/controller/document/FileView.js" type="text/javascript"></script>
|
||||
<script src="app/docs/controller/document/FileModalView.js" type="text/javascript"></script>
|
||||
<script src="app/docs/controller/document/FileRename.js" type="text/javascript"></script>
|
||||
<script src="app/docs/controller/document/ModalFileVersions.js" type="text/javascript"></script>
|
||||
<script src="app/docs/controller/tag/Tag.js" type="text/javascript"></script>
|
||||
<script src="app/docs/controller/tag/TagEdit.js" type="text/javascript"></script>
|
||||
<script src="app/docs/controller/settings/Settings.js" type="text/javascript"></script>
|
||||
|
||||
@ -119,7 +119,8 @@
|
||||
"add_files": "Add files",
|
||||
"file_processing_indicator": "This file is being processed. Searching will not be available before it is complete.",
|
||||
"reprocess_file": "Reprocess this file",
|
||||
"upload_new_version": "Upload a new version"
|
||||
"upload_new_version": "Upload a new version",
|
||||
"open_versions": "Show version history"
|
||||
},
|
||||
"workflow": {
|
||||
"workflow": "Workflow",
|
||||
@ -204,6 +205,13 @@
|
||||
"edit": {
|
||||
"title": "Edit file",
|
||||
"name": "Filename"
|
||||
},
|
||||
"versions": {
|
||||
"title": "Version history",
|
||||
"filename": "Filename",
|
||||
"mimetype": "Type",
|
||||
"create_date": "Creation date",
|
||||
"version": "Version"
|
||||
}
|
||||
},
|
||||
"tag": {
|
||||
|
||||
@ -68,18 +68,32 @@
|
||||
<span class="fas fa-pencil-alt"></span>
|
||||
{{ 'rename' | translate }}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href ng-click="processFile(file)">
|
||||
<span class="fas fa-eye"></span>
|
||||
{{ 'document.view.content.reprocess_file' | translate }}
|
||||
</a>
|
||||
</li>
|
||||
<li role="separator" class="divider"></li>
|
||||
<li>
|
||||
<a href ngf-select
|
||||
ngf-change="uploadNewVersion($files, file)"
|
||||
ngf-multiple="false">
|
||||
<span class="fas fa-plus"></span>
|
||||
{{ 'document.view.content.upload_new_version' | translate }}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href ng-click="openVersions(file)">
|
||||
<span class="fas fa-angle-double-left"></span>
|
||||
{{ 'document.view.content.open_versions' | translate }}
|
||||
</a>
|
||||
</li>
|
||||
<li role="separator" class="divider"></li>
|
||||
<li>
|
||||
<a href ng-click="deleteFile(file)">
|
||||
<span class="fas fa-trash"></span>
|
||||
<span class="fas fa-trash text-danger"></span>
|
||||
{{ 'delete' | translate }}
|
||||
</a>
|
||||
</li>
|
||||
|
||||
30
docs-web/src/main/webapp/src/partial/docs/file.versions.html
Normal file
30
docs-web/src/main/webapp/src/partial/docs/file.versions.html
Normal file
@ -0,0 +1,30 @@
|
||||
<div class="modal-header">
|
||||
<h3>{{ 'file.versions.title' | translate }}</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<table class="table table-striped table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{ 'file.versions.filename' | translate }}</th>
|
||||
<th>{{ 'file.versions.mimetype' | translate }}</th>
|
||||
<th>{{ 'file.versions.create_date' | translate }}</th>
|
||||
<th>{{ 'file.versions.version' | translate }}</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="file in files">
|
||||
<td>{{ file.name }}</td>
|
||||
<td>{{ file.mimetype }}</td>
|
||||
<td>{{ file.create_date | timeAgo: dateFormat }}</td>
|
||||
<td>v{{ file.version +1 }}.0</td>
|
||||
<td>
|
||||
<span class="fas fa-eye pointer" ng-click="openFile(file)"></span>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button ng-click="close()" class="btn btn-default">{{ 'close' | translate }}</button>
|
||||
</div>
|
||||
Loading…
Reference in New Issue
Block a user