Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-24 15:49:44 +02:00
Code Releases Activity

Clean up

Browse source
This commit is contained in:
zinyando 2016-08-16 13:34:09 +02:00
parent 6121e640d8
commit a63a6cd709
10 changed files with 64 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@ import Model from 'ember-data/model';
import attr from 'ember-data/attr';
import constants from '../utils/constants';
import stringUtil from '../utils/string';
import Ember from 'ember';
// import { belongsTo, hasMany } from 'ember-data/relationships';
export default Model.extend({

1
app/app/models/protected-folder-participant.js
View file

@ -1,5 +1,6 @@
import Model from 'ember-data/model';
import attr from 'ember-data/attr';
import Ember from 'ember';
// import { belongsTo, hasMany } from 'ember-data/relationships';
export default Model.extend({

1
app/app/models/section.js
View file

@ -1,5 +1,6 @@
import Model from 'ember-data/model';
import attr from 'ember-data/attr';
import Ember from 'ember';
// import { belongsTo, hasMany } from 'ember-data/relationships';
export default Model.extend({

9
app/app/services/ajax.js
View file

@ -1,11 +1,11 @@
// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
//
// This software (Documize Community Edition) is licensed under
// This software (Documize Community Edition) is licensed under
// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
//
// You can operate outside the AGPL restrictions by purchasing
// Documize Enterprise Edition and obtaining a commercial license
// by contacting <sales@documize.com>.
// by contacting <sales@documize.com>.
//
// https://documize.com
@ -14,6 +14,7 @@ import AjaxService from 'ember-ajax/services/ajax';
import config from '../config/environment';
const {
computed,
inject: { service }
} = Ember;
@ -22,7 +23,7 @@ export default AjaxService.extend({
host: config.apiHost,
namespace: config.apiNamespace,
headers: Ember.computed('session.session.content.authenticated.token', {
headers: computed('session.session.content.authenticated.token', {
get() {
let headers = {};
const token = this.get('session.session.content.authenticated.token');
@ -33,4 +34,4 @@ export default AjaxService.extend({
return headers;
}
})
});
});

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

@ -13,9 +13,13 @@ import Ember from 'ember';
import netUtil from '../utils/net';
import config from '../config/environment';
const {
inject: { service }
} = Ember;
export default Ember.Service.extend({
session: Ember.inject.service('session'),
appMeta: Ember.inject.service(),
session: service('session'),
appMeta: service(),
ready: false,
enabled: config.APP.auditEnabled,
appId: config.APP.intercomKey,

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

@ -253,6 +253,10 @@ export default Ember.Service.extend({
}).then((response) => {
let data = [];
if (isObject(response)) {
return data;
}
data = response.map((obj) => {
let data = this.get('store').normalize('attachment', obj);
return this.get('store').push({ data: data });
@ -270,3 +274,7 @@ export default Ember.Service.extend({
});
},
});
function isObject(a) {
return (!!a) && (a.constructor === Object);
}

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

@ -14,6 +14,7 @@ import BaseService from '../services/base';
const {
get,
RSVP: { resolve },
inject: { service }
} = Ember;
@ -29,7 +30,6 @@ export default BaseService.extend({
// Add a new folder.
add(folder) {
return this.get('ajax').post(`folders`, {
contentType: 'json',
data: JSON.stringify(folder)
@ -54,7 +54,7 @@ export default BaseService.extend({
getAll() {
if (this.get('folders') != null) {
return new Ember.RSVP.resolve(this.get('folders'));
return new resolve(this.get('folders'));
} else {
return this.reload();
}

22
app/app/services/search.js
View file

@ -11,16 +11,20 @@
import Ember from 'ember';
const {
inject: { service }
} = Ember;
export default Ember.Service.extend({
sessionService: Ember.inject.service('session'),
ajax: Ember.inject.service(),
sessionService: service('session'),
ajax: service(),
// getUsers returns all users for organization.
find(keywords) {
let url = "search?keywords=" + encodeURIComponent(keywords);
// getUsers returns all users for organization.
find(keywords) {
let url = "search?keywords=" + encodeURIComponent(keywords);
return this.get('ajax').request(url, {
method: "GET"
});
},
return this.get('ajax').request(url, {
method: "GET"
});
},
});

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

@ -12,10 +12,14 @@
import Ember from 'ember';
import BaseService from '../services/base';
const {
inject: { service }
} = Ember;
export default BaseService.extend({
sessionService: Ember.inject.service('session'),
ajax: Ember.inject.service(),
store: Ember.inject.service(),
sessionService: service('session'),
ajax: service(),
store: service(),
// Returns all available sections.
getAll() {

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

@ -11,10 +11,16 @@
import Ember from 'ember';
const {
isEmpty,
RSVP,
inject: { service }
} = Ember;
export default Ember.Service.extend({
sessionService: Ember.inject.service('session'),
ajax: Ember.inject.service(),
store: Ember.inject.service(),
sessionService: service('session'),
ajax: service(),
store: service(),
// Adds a new user.
add(user) {
@ -23,8 +29,8 @@ export default Ember.Service.extend({
data: JSON.stringify(user),
contentType: 'json'
}).then((response) => {
let user = this.get('store').normalize('user', response);
return this.get('store').push({ data: user });
let data = this.get('store').normalize('user', response);
return this.get('store').push({ data: data });
});
},
@ -35,8 +41,8 @@ export default Ember.Service.extend({
return this.get('ajax').request(url, {
type: 'GET'
}).then((response) => {
let user = this.get('store').normalize('user', response);
return this.get('store').push({ data: user });
let data = this.get('store').normalize('user', response);
return this.get('store').push({ data: data });
});
},
@ -44,8 +50,8 @@ export default Ember.Service.extend({
getAll() {
return this.get('ajax').request(`users`).then((response) => {
return response.map((obj) => {
let user = this.get('store').normalize('user', obj);
return this.get('store').push({ data: user });
let data = this.get('store').normalize('user', obj);
return this.get('store').push({ data: data });
});
});
},
@ -61,7 +67,7 @@ export default Ember.Service.extend({
data = response.map((obj) => {
let data = this.get('store').normalize('user', obj);
return this.get('store').push({ data: data })
return this.get('store').push({ data: data });
});
return data;
@ -105,8 +111,8 @@ export default Ember.Service.extend({
forgotPassword(email) {
let url = `public/forgot`;
if (is.empty(email)) {
return Ember.RSVP.reject("invalid");
if (isEmpty(email)) {
return RSVP.reject("invalid");
}
let data = JSON.stringify({
@ -124,8 +130,8 @@ export default Ember.Service.extend({
resetPassword(token, password) {
var url = `public/reset/${token}`;
if (is.empty(token) || is.empty(password)) {
return Ember.RSVP.reject("invalid");
if (isEmpty(token) || isEmpty(password)) {
return RSVP.reject("invalid");
}
return this.get('ajax').request(url, {