Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-08 06:55:28 +02:00
Code Releases Activity

Merge branch 'master' into github-extension

Browse source
This commit is contained in:
Elliott Stoneham 2016-07-07 16:45:06 +01:00
commit 203d2e8a4d
5 changed files with 329 additions and 332 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/app/authenticators/documize.js
View file

@ -2,7 +2,6 @@ import Ember from 'ember';
import Base from 'ember-simple-auth/authenticators/base'; import Base from 'ember-simple-auth/authenticators/base';
import encodingUtil from '../utils/encoding'; import encodingUtil from '../utils/encoding';
import netUtil from '../utils/net'; import netUtil from '../utils/net';
import models from '../utils/model';
const { const {
isPresent, isPresent,

4
app/app/pods/folders/settings/route.js
View file

@ -1,7 +1,6 @@
import Ember from 'ember'; import Ember from 'ember';
import models from '../../../utils/model'; import models from '../../../utils/model';
import NotifierMixin from '../../../mixins/notifier'; import NotifierMixin from '../../../mixins/notifier';
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
export default Ember.Route.extend(NotifierMixin, { export default Ember.Route.extend(NotifierMixin, {
folderService: Ember.inject.service('folder'), folderService: Ember.inject.service('folder'),
@ -114,7 +113,8 @@ export default Ember.Route.extend(NotifierMixin, {
onPermission: function (folder, message, permissions) { onPermission: function (folder, message, permissions) {
var self = this; var self = this;
var data = permissions.map(function (obj) { var data = permissions.map(function (obj) {
return obj.getProperties('orgId', 'folderId', 'userId', 'canEdit', 'canView'); }); return obj.getProperties('orgId', 'folderId', 'userId', 'canEdit', 'canView');
});
var payload = { Message: message, Roles: data }; var payload = { Message: message, Roles: data };
this.get('folderService').savePermissions(folder.get('id'), payload).then(function () { this.get('folderService').savePermissions(folder.get('id'), payload).then(function () {

8
app/app/pods/profile/route.js
View file

@ -6,19 +6,17 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
folderService: Ember.inject.service('folder'), folderService: Ember.inject.service('folder'),
session: Ember.inject.service(), session: Ember.inject.service(),
beforeModel: function () {
beforeModel: function() {
if (!this.get("session").authenticated) { if (!this.get("session").authenticated) {
this.transitionTo('auth.login'); this.transitionTo('auth.login');
} }
}, },
model: function() { model: function () {
return this.get('userService').getUser(this.get("session.session.authenticated.user.id")); return this.get('userService').getUser(this.get("session.session.authenticated.user.id"));
debugger;
}, },
afterModel: function(model) { afterModel: function (model) {
this.browser.setTitleWithoutSuffix(model.get('fullname')); this.browser.setTitleWithoutSuffix(model.get('fullname'));
}, },

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

@ -1,8 +1,8 @@
import Ember from 'ember';
import AjaxService from 'ember-ajax/services/ajax'; import AjaxService from 'ember-ajax/services/ajax';
import config from '../config/environment'; import config from '../config/environment';
const { const {
computed,
inject: { service } inject: { service }
} = Ember; } = Ember;

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

@ -34,7 +34,7 @@ export default Ember.Service.extend({
content: Ember.A([]) content: Ember.A([])
}); });
_.each(response, function(doc) { _.each(response, function (doc) {
let documentModel = models.DocumentModel.create(doc); let documentModel = models.DocumentModel.create(doc);
documents.pushObject(documentModel); documents.pushObject(documentModel);
}); });
@ -52,7 +52,7 @@ export default Ember.Service.extend({
content: Ember.A([]) content: Ember.A([])
}); });
_.each(response, function(doc) { _.each(response, function (doc) {
let documentModel = models.DocumentModel.create(doc); let documentModel = models.DocumentModel.create(doc);
documents.pushObject(documentModel); documents.pushObject(documentModel);
}); });
@ -71,7 +71,7 @@ export default Ember.Service.extend({
}); });
}, },
getBatchedPages: function(documentId, payload) { getBatchedPages: function (documentId, payload) {
let url = `documents/${documentId}/pages/batch`; let url = `documents/${documentId}/pages/batch`;
return this.get('ajax').request(url, { return this.get('ajax').request(url, {
@ -86,7 +86,7 @@ export default Ember.Service.extend({
}); });
}, },
changePageSequence: function(documentId, payload) { changePageSequence: function (documentId, payload) {
let url = `documents/${documentId}/pages/sequence`; let url = `documents/${documentId}/pages/sequence`;
return this.get('ajax').post(url, { return this.get('ajax').post(url, {
@ -104,7 +104,7 @@ export default Ember.Service.extend({
}); });
}, },
deleteDocument: function(documentId) { deleteDocument: function (documentId) {
let url = `documents/${documentId}`; let url = `documents/${documentId}`;
return this.get('ajax').request(url, { return this.get('ajax').request(url, {
@ -112,9 +112,9 @@ export default Ember.Service.extend({
}); });
}, },
updatePage: function(documentId, pageId, payload, skipRevision) { updatePage: function (documentId, pageId, payload, skipRevision) {
var revision = skipRevision ? "?r=true" : "?r=false"; var revision = skipRevision ? "?r=true" : "?r=false";
let url = `documents/${documentId}/pages/${pageId}${revision}` let url = `documents/${documentId}/pages/${pageId}${revision}`;
return this.get('ajax').request(url, { return this.get('ajax').request(url, {
method: 'PUT', method: 'PUT',
@ -124,7 +124,7 @@ export default Ember.Service.extend({
}, },
// addPage inserts new page to an existing document. // addPage inserts new page to an existing document.
addPage: function(documentId, payload) { addPage: function (documentId, payload) {
let url = `documents/${documentId}/pages`; let url = `documents/${documentId}/pages`;
return this.get('ajax').post(url, { return this.get('ajax').post(url, {
@ -134,7 +134,7 @@ export default Ember.Service.extend({
}, },
// Nukes multiple pages from the document. // Nukes multiple pages from the document.
deletePages: function(documentId, pageId, payload) { deletePages: function (documentId, pageId, payload) {
let url = `documents/${documentId}/pages/${pageId}`; let url = `documents/${documentId}/pages/${pageId}`;
return this.get('ajax').post(url, { return this.get('ajax').post(url, {
@ -144,7 +144,7 @@ export default Ember.Service.extend({
}, },
// Nukes a single page from the document. // Nukes a single page from the document.
deletePage: function(documentId, pageId) { deletePage: function (documentId, pageId) {
let url = `documents/${documentId}/pages/${pageId}`; let url = `documents/${documentId}/pages/${pageId}`;
return this.get('ajax').request(url, { return this.get('ajax').request(url, {
@ -192,7 +192,7 @@ export default Ember.Service.extend({
method: 'GET' method: 'GET'
}).then((response) => { }).then((response) => {
let data = []; let data = [];
_.each(response, function(obj) { _.each(response, function (obj) {
data.pushObject(models.PageModel.create(obj)); data.pushObject(models.PageModel.create(obj));
}); });
@ -208,7 +208,7 @@ export default Ember.Service.extend({
}).then((response) => { }).then((response) => {
let pages = []; let pages = [];
_.each(response, function(page) { _.each(response, function (page) {
pages.pushObject(models.PageModel.create(page)); pages.pushObject(models.PageModel.create(page));
}); });
@ -245,7 +245,7 @@ export default Ember.Service.extend({
method: 'GET' method: 'GET'
}).then((response) => { }).then((response) => {
let data = []; let data = [];
_.each(response, function(obj) { _.each(response, function (obj) {
data.pushObject(models.AttachmentModel.create(obj)); data.pushObject(models.AttachmentModel.create(obj));
}); });
return data; return data;