Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-19 13:19:43 +02:00
Code Releases Activity

Rename document role to permission

Browse source
This commit is contained in:
sauls8t 2018-03-06 13:36:11 +00:00
parent 93b95b9eca
commit ad3f406876
5 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gui/app/components/folder/category-admin.js
View file

@ -17,7 +17,6 @@ import ModalMixin from '../../mixins/modal';
import Component from '@ember/component'; import Component from '@ember/component';
export default Component.extend(ModalMixin, TooltipMixin, { export default Component.extend(ModalMixin, TooltipMixin, {
// userService: service('user'),
spaceSvc: service('folder'), spaceSvc: service('folder'),
groupSvc: service('group'), groupSvc: service('group'),
categorySvc: service('category'), categorySvc: service('category'),

14
gui/app/models/document-role.js → gui/app/models/document-permission.js
View file

@ -15,11 +15,11 @@ import attr from 'ember-data/attr';
export default Model.extend({ export default Model.extend({
orgId: attr('string'), orgId: attr('string'),
documentId: attr('string'), documentId: attr('string'),
userId: attr('string'), whoId: attr('string'),
fullname: attr('string'), // client-side usage only, not from API who: attr('string'),
name: attr('string'),
documentEdit: attr('boolean'), // space level setting documentEdit: attr('boolean'),
documentApprove: attr('boolean'), // space level setting documentApprove: attr('boolean'),
documentRoleEdit: attr('boolean'), // document level setting documentRoleEdit: attr('boolean'),
documentRoleApprove: attr('boolean') // document level setting documentRoleApprove: attr('boolean')
}); });

2
gui/app/serializers/document-role.js → gui/app/serializers/document-permission.js
View file

@ -4,7 +4,7 @@ export default ApplicationSerializer.extend({
normalize(modelClass, resourceHash) { normalize(modelClass, resourceHash) {
return { return {
data: { data: {
id: resourceHash.userId ? resourceHash.userId : 0, id: resourceHash.whoId ? resourceHash.whoId : 0,
type: modelClass.modelName, type: modelClass.modelName,
attributes: resourceHash attributes: resourceHash
} }

2
gui/app/services/document.js
View file

@ -343,7 +343,7 @@ export default Service.extend({
perms = this.get('store').push(perms); perms = this.get('store').push(perms);
this.get('folderService').set('permissions', perms); this.get('folderService').set('permissions', perms);
let roles = this.get('store').normalize('document-role', response.roles); let roles = this.get('store').normalize('document-permission', response.roles);
roles = this.get('store').push(roles); roles = this.get('store').push(roles);
let folders = response.folders.map((obj) => { let folders = response.folders.map((obj) => {

4
server/routing/routes.go
View file

@ -97,10 +97,6 @@ func RegisterEndpoints(rt *env.Runtime, s *domain.Store) {
Add(rt, RoutePrefixPrivate, "documents/{documentID}", []string{"GET", "OPTIONS"}, nil, document.Get) Add(rt, RoutePrefixPrivate, "documents/{documentID}", []string{"GET", "OPTIONS"}, nil, document.Get)
Add(rt, RoutePrefixPrivate, "documents/{documentID}", []string{"PUT", "OPTIONS"}, nil, document.Update) Add(rt, RoutePrefixPrivate, "documents/{documentID}", []string{"PUT", "OPTIONS"}, nil, document.Update)
Add(rt, RoutePrefixPrivate, "documents/{documentID}", []string{"DELETE", "OPTIONS"}, nil, document.Delete) Add(rt, RoutePrefixPrivate, "documents/{documentID}", []string{"DELETE", "OPTIONS"}, nil, document.Delete)
// Add(rt, RoutePrefixPrivate, "documents/{documentID}/permissions", []string{"GET", "OPTIONS"}, nil, permission.GetDocumentPermissions)
// Add(rt, RoutePrefixPrivate, "documents/{documentID}/permissions", []string{"PUT", "OPTIONS"}, nil, permission.SetDocumentPermissions)
// Add(rt, RoutePrefixPrivate, "documents/{documentID}/permissions/user", []string{"GET", "OPTIONS"}, nil, permission.GetUserDocumentPermissions)
Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/level", []string{"POST", "OPTIONS"}, nil, page.ChangePageLevel) Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/level", []string{"POST", "OPTIONS"}, nil, page.ChangePageLevel)
Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/sequence", []string{"POST", "OPTIONS"}, nil, page.ChangePageSequence) Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/sequence", []string{"POST", "OPTIONS"}, nil, page.ChangePageSequence)
Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}/revisions", []string{"GET", "OPTIONS"}, nil, page.GetRevisions) Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}/revisions", []string{"GET", "OPTIONS"}, nil, page.GetRevisions)