mirror of
https://github.com/sismics/docs.git
synced 2024-11-22 05:57:57 +01:00
#13: Display the document's creator
This commit is contained in:
parent
fc1bb22d8d
commit
82ba0b5761
@ -26,9 +26,10 @@ Features
|
||||
- Full text search in image and PDF
|
||||
- SHA-256 encryption
|
||||
- Tag system
|
||||
- Multi-users
|
||||
- Document sharing
|
||||
- Multi-users ACL system
|
||||
- Document sharing by URL
|
||||
- RESTful Web API
|
||||
- Modern Android client
|
||||
|
||||
Download
|
||||
--------
|
||||
|
@ -38,6 +38,7 @@ import com.sismics.docs.core.dao.jpa.AclDao;
|
||||
import com.sismics.docs.core.dao.jpa.DocumentDao;
|
||||
import com.sismics.docs.core.dao.jpa.FileDao;
|
||||
import com.sismics.docs.core.dao.jpa.TagDao;
|
||||
import com.sismics.docs.core.dao.jpa.UserDao;
|
||||
import com.sismics.docs.core.dao.jpa.criteria.DocumentCriteria;
|
||||
import com.sismics.docs.core.dao.jpa.dto.AclDto;
|
||||
import com.sismics.docs.core.dao.jpa.dto.DocumentDto;
|
||||
@ -83,6 +84,7 @@ public class DocumentResource extends BaseResource {
|
||||
|
||||
DocumentDao documentDao = new DocumentDao();
|
||||
AclDao aclDao = new AclDao();
|
||||
UserDao userDao = new UserDao();
|
||||
Document documentDb;
|
||||
try {
|
||||
documentDb = documentDao.getDocument(documentId);
|
||||
@ -101,7 +103,7 @@ public class DocumentResource extends BaseResource {
|
||||
document.put("description", documentDb.getDescription());
|
||||
document.put("create_date", documentDb.getCreateDate().getTime());
|
||||
document.put("language", documentDb.getLanguage());
|
||||
document.put("creator", documentDb.getUserId());
|
||||
document.put("creator", userDao.getById(documentDb.getUserId()).getUsername());
|
||||
|
||||
// Add tags
|
||||
TagDao tagDao = new TagDao();
|
||||
|
@ -117,6 +117,7 @@ angular.module('docs').controller('DocumentView', function ($scope, $state, $sta
|
||||
// Display the new share ACL and add it to the local ACLs
|
||||
$scope.showShare(acl);
|
||||
$scope.document.acls.push(acl);
|
||||
$scope.document.acls = angular.copy($scope.document.acls);
|
||||
})
|
||||
});
|
||||
};
|
||||
|
@ -6,7 +6,9 @@
|
||||
angular.module('docs').controller('Login', function($scope, $rootScope, $state, $dialog, User) {
|
||||
$scope.login = function() {
|
||||
User.login($scope.user).then(function() {
|
||||
$rootScope.userInfo = User.userInfo(true);
|
||||
User.userInfo(true).then(function(data) {
|
||||
$rootScope.userInfo = data;
|
||||
});
|
||||
$state.transitionTo('document.default');
|
||||
}, function() {
|
||||
var title = 'Login failed';
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
<div class="page-header">
|
||||
<h1>
|
||||
{{ document.title }} <small>{{ document.create_date | date: 'yyyy-MM-dd' }}</small>
|
||||
{{ document.title }} <small>{{ document.create_date | date: 'yyyy-MM-dd' }} by {{ document.creator }}</small>
|
||||
<img ng-if="document" ng-src="img/flag/{{ document.language }}.png" title="{{ document.language }}" />
|
||||
<a ng-href="../api/file/zip?id={{ document.id }}" class="btn btn-default" title="Download all files">
|
||||
<span class="glyphicon glyphicon-download-alt"></span>
|
||||
@ -92,7 +92,7 @@
|
||||
<td>
|
||||
<span class="label label-default" style="margin-right: 6px;" ng-repeat="a in acl | orderBy: 'perm'">
|
||||
{{ a.perm }}
|
||||
<span ng-show="document.creator != a.id && document.writable"
|
||||
<span ng-show="document.creator != a.name && a.type == 'USER' && document.writable"
|
||||
class="glyphicon glyphicon-remove pointer"
|
||||
ng-click="deleteAcl(a)"></span>
|
||||
</span>
|
||||
|
Loading…
Reference in New Issue
Block a user