Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-21 06:09:42 +02:00
Code Releases Activity

Cleanup and fixes

Browse source
This commit is contained in:
zinyando 2016-08-12 14:02:57 +02:00
parent f6febf765c
commit 6121e640d8
8 changed files with 79 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/app/models/folder.js
View file

@ -14,15 +14,15 @@ export default Model.extend({
return stringUtil.makeSlug(this.get('name'));
}),
markAsRestricted: function () {
markAsRestricted() {
this.set('folderType', constants.FolderType.Protected);
},
markAsPrivate: function () {
markAsPrivate() {
this.set('folderType', constants.FolderType.Private);
},
markAsPublic: function () {
markAsPublic() {
this.set('folderType', constants.FolderType.Public);
},

9
app/app/models/organization.js
View file

@ -1,7 +1,12 @@
import Model from 'ember-data/model';
// import attr from 'ember-data/attr';
import attr from 'ember-data/attr';
// import { belongsTo, hasMany } from 'ember-data/relationships';
export default Model.extend({
title: attr('string'),
message: attr('string'),
email: attr('string'),
allowAnonymousAccess: attr('boolean', { defaultValue: false }),
created: attr(),
revised: attr()
});

33
app/app/services/document.js
View file

@ -25,8 +25,8 @@ export default Ember.Service.extend({
return this.get('ajax').request(`documents/${documentId}`, {
method: "GET"
}).then((response) => {
let doc = this.get('store').normalize('document', response);
return this.get('store').push({ data: doc });
let data = this.get('store').normalize('document', response);
return this.get('store').push({ data: data });
});
},
@ -39,10 +39,9 @@ export default Ember.Service.extend({
content: Ember.A([])
});
_.each(response, (doc) => {
documents = response.map((doc) => {
let data = this.get('store').normalize('document', doc);
let documentModel = this.get('store').push({ data: data });
documents.pushObject(documentModel);
return this.get('store').push({ data: data });
});
return documents;
@ -58,10 +57,9 @@ export default Ember.Service.extend({
content: Ember.A([])
});
_.each(response, function (doc) {
documents = response.map((doc) => {
let data = this.get('store').normalize('document', doc);
let documentModel = this.get('store').push({ data: data });
documents.pushObject(documentModel);
return this.get('store').push({ data: data });
});
return documents;
@ -199,10 +197,9 @@ export default Ember.Service.extend({
method: 'GET'
}).then((response) => {
let data = [];
_.each(response, (obj) => {
data = response.map((obj) => {
let data = this.get('store').normalize('page', obj);
let tableOfContents = this.get('store').push({ data: data });
data.pushObject(tableOfContents);
return this.get('store').push({ data: data });
});
return data;
@ -217,10 +214,9 @@ export default Ember.Service.extend({
}).then((response) => {
let pages = [];
_.each(response, (page) => {
pages = response.map((page) => {
let data = this.get('store').normalize('page', page);
let pageData = this.get('store').push({ data: data });
pages.pushObject(pageData);
return this.get('store').push({ data: data });
});
return pages;
@ -256,11 +252,12 @@ export default Ember.Service.extend({
method: 'GET'
}).then((response) => {
let data = [];
_.each(response, (obj) => {
let attachmentData = this.get('store').normalize('attachment', obj);
let attachments = this.get('store').push({ data: attachmentData });
data.pushObject(attachments);
data = response.map((obj) => {
let data = this.get('store').normalize('attachment', obj);
return this.get('store').push({ data: data });
});
return data;
});
},

30
app/app/services/folder.js
View file

@ -11,7 +11,6 @@
import Ember from 'ember';
import BaseService from '../services/base';
import models from '../utils/model';
const {
get,
@ -55,9 +54,7 @@ export default BaseService.extend({
getAll() {
if (this.get('folders') != null) {
return new Ember.RSVP.Promise((resolve) => {
resolve(this.get('folders'));
});
return new Ember.RSVP.resolve(this.get('folders'));
} else {
return this.reload();
}
@ -97,11 +94,10 @@ export default BaseService.extend({
method: "GET"
}).then((response) => {
let data = [];
_.each(response, (obj) => {
debugger;
let participantData = this.get('store').normalize('protected-folder-participant', obj);
let participant = this.get('store').push({ data: participantData });
data.pushObject(participant);
data = response.map((obj) => {
let data = this.get('store').normalize('protected-folder-participant', obj);
return this.get('store').push({ data: data });
});
return data;
@ -115,10 +111,10 @@ export default BaseService.extend({
method: "GET"
}).then((response) => {
let data = [];
_.each(response, (obj) => {
let folderData = this.get('store').normalize('folder', obj);
let folder = this.get('store').push({ data: folderData });
data.pushObject(folder);
data = response.map((obj) => {
let data = this.get('store').normalize('folder', obj);
return this.get('store').push({ data: data });
});
return data;
@ -132,10 +128,10 @@ export default BaseService.extend({
method: "GET"
}).then((response) => {
let data = [];
_.each(response, (obj) => {
let permissionData = this.get('store').normalize('folder-permission', obj);
let permission = this.get('store').push({ data: permissionData });
data.pushObject(permission);
data = response.map((obj) => {
let data = this.get('store').normalize('folder-permission', obj);
return this.get('store').push({ data: data });
});
return data;

16
app/app/services/organization.js
View file

@ -10,20 +10,24 @@
// https://documize.com
import Ember from 'ember';
import models from '../utils/model';
const {
inject: { service }
} = Ember;
export default Ember.Service.extend({
sessionService: Ember.inject.service('session'),
ajax: Ember.inject.service(),
appMeta: Ember.inject.service(),
sessionService: service('session'),
ajax: service(),
appMeta: service(),
store: service(),
// Returns attributes for specified org id.
getOrg(id) {
return this.get('ajax').request(`organizations/${id}`, {
method: 'GET'
}).then((response) => {
let org = models.OrganizationModel.create(response);
return org;
let data = this.get('store').normalize('organization', response);
return this.get('store').push({ data: data });
});
},

15
app/app/services/section.js
View file

@ -10,7 +10,6 @@
// https://documize.com
import Ember from 'ember';
import models from '../utils/model';
import BaseService from '../services/base';
export default BaseService.extend({
@ -24,11 +23,10 @@ export default BaseService.extend({
method: 'GET'
}).then((response) => {
let data = [];
_.each(response, (obj) => {
debugger;
let sectionData = this.get('store').normalize('section', obj);
let section = this.get('store').push({ data: sectionData });
data.pushObject(section);
data = response.map((obj) => {
let data = this.get('store').normalize('section', obj);
return this.get('store').push({ data: data });
});
return data;
@ -58,10 +56,9 @@ export default BaseService.extend({
let pages = [];
if (is.not.null(response) && is.array(response) && response.length > 0) {
_.each(response, (page) => {
pages = response.map((page) => {
let data = this.get('store').normalize('page', page);
let pageData = this.get('store').push({ data: data });
pages.pushObject(pageData);
return this.get('store').push({ data: data });
});
}

6
app/app/services/template.js
View file

@ -10,7 +10,6 @@
// https://documize.com
import Ember from 'ember';
import models from '../utils/model';
const {
inject: { service }
@ -49,10 +48,9 @@ export default Ember.Service.extend({
content: Ember.A([])
});
_.each(response, (template) => {
templates = response.map((template) => {
let data = this.get('store').normalize('template', template);
let templateModel = this.get('store').push({ data: data });
templates.pushObject(templateModel);
return this.get('store').push({ data: data });
});
return templates;

8
app/app/services/user.js
View file

@ -10,7 +10,6 @@
// https://documize.com
import Ember from 'ember';
// import models from '../utils/model';
export default Ember.Service.extend({
sessionService: Ember.inject.service('session'),
@ -59,9 +58,10 @@ export default Ember.Service.extend({
method: "GET"
}).then((response) => {
let data = [];
_.each(response, (obj) => {
let user = this.get('store').normalize('user', obj);
data.pushObject(this.get('store').push({ data: user }));
data = response.map((obj) => {
let data = this.get('store').normalize('user', obj);
return this.get('store').push({ data: data })
});
return data;