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

fix local storage of last used space id

Browse source
This commit is contained in:
Elliott Stoneham 2016-07-15 18:16:22 +01:00
parent 8fcf67ef17
commit f4fc567292
2 changed files with 163 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/app/pods/folders/route.js
View file

@ -11,6 +11,7 @@
import Ember from 'ember'; import Ember from 'ember';
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
import { isNotFoundError } from 'ember-ajax/errors';
const { const {
isPresent isPresent
@ -31,20 +32,23 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
if (is.empty(params)) { if (is.empty(params)) {
let lastFolder = this.get('localStorage').getSessionItem("folder"); let lastFolder = this.get('localStorage').getSessionItem("folder");
let self = this;
//If folder lastFolder is defined //If folder lastFolder is defined
if (isPresent(lastFolder)) { if (isPresent(lastFolder)) {
return this.get('folderService').getFolder(lastFolder).then((folder) => { return this.get('folderService').getFolder(lastFolder).then((folder) => {
//if Response is null or undefined redirect to login else transitionTo dashboard //if Response is null or undefined redirect to login else transitionTo dashboard
if (Ember.isNone(folder)) { if (Ember.isNone(folder)) {
this.transitionTo('auth.login'); self.get('localStorage').clearSessionItem("folder");
this.transitionTo('application');
} }
Ember.set(this, 'folder', folder); Ember.set(this, 'folder', folder);
this.transitionTo('folders.folder', folder.get('id'), folder.get('slug')); this.transitionTo('folders.folder', folder.get('id'), folder.get('slug'));
}).catch(() => { }).catch(() => {
//if there was an error redirect to login //if there was an error redirect to login
this.transitionTo('auth.login'); self.get('localStorage').clearSessionItem("folder");
this.transitionTo('application');
}); });
} }
@ -64,11 +68,16 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
//If folder route has params //If folder route has params
if (isPresent(params)) { if (isPresent(params)) {
let self = this;
let folderId = this.paramsFor('folders.folder').folder_id; let folderId = this.paramsFor('folders.folder').folder_id;
return this.get('folderService').getFolder(folderId).then((folder) => { return this.get('folderService').getFolder(folderId).then((folder) => {
Ember.set(this, 'folder', folder); Ember.set(this, 'folder', folder);
}).catch(function (error) {
if (isNotFoundError(error)) {
// handle 404 errors here
self.transitionTo('application');
}
}); });
} }

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

@ -22,7 +22,6 @@ export default BaseService.extend({
ajax: Ember.inject.service(), ajax: Ember.inject.service(),
localStorage: Ember.inject.service(), localStorage: Ember.inject.service(),
// selected folder // selected folder
currentFolder: null, currentFolder: null,
canEditCurrentFolder: false, canEditCurrentFolder: false,