From 31c3c9bf3356eff636dfaf34e652220983eb6f69 Mon Sep 17 00:00:00 2001
From: Markus Grigull <web@grigull.me>
Date: Fri, 3 Feb 2017 15:02:35 +0100
Subject: [PATCH] Minor fixes

---
 app/adapters/application.js   | 8 +++++++-
 app/components/widget-plot.js | 2 +-
 app/mixins/draggable.js       | 2 +-
 app/mixins/droppable.js       | 2 +-
 app/mixins/live-data.js       | 2 +-
 app/mixins/resizable.js       | 2 +-
 app/mixins/sortable.js        | 2 +-
 app/services/session-user.js  | 2 +-
 8 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/adapters/application.js b/app/adapters/application.js
index 961ded9..c87b180 100644
--- a/app/adapters/application.js
+++ b/app/adapters/application.js
@@ -15,5 +15,11 @@ export default RESTAdapter.extend(DataAdapterMixin, {
   host: 'http://' + ENV.APP.API_HOST,
   namespace: 'api/v1',
   authorizer: 'authorizer:custom',
-  headers: { 'Content-Type': 'application/json', 'Accept': 'application/json' }
+  headers: { 'Content-Type': 'application/json', 'Accept': 'application/json' },
+
+  urlForQueryRecord(query /*, modelName */) {
+    // Fix for /users/me query
+    let baseUrl = this.buildURL();
+    return baseUrl + '/users/' + query;
+  }
 });
diff --git a/app/components/widget-plot.js b/app/components/widget-plot.js
index 6bc681d..9b553d7 100644
--- a/app/components/widget-plot.js
+++ b/app/components/widget-plot.js
@@ -114,7 +114,7 @@ export default WidgetAbstract.extend({
     if (diff > diffValue) {
       firstTimestamp = lastTimestamp - diffValue;
     } else {
-      lastTimestamp = +firstTimestamp + +diffValue;
+      lastTimestamp = firstTimestamp + diffValue;
     }
 
     plotOptions.xaxis.min = firstTimestamp;
diff --git a/app/mixins/draggable.js b/app/mixins/draggable.js
index 811b31e..1edf9f4 100644
--- a/app/mixins/draggable.js
+++ b/app/mixins/draggable.js
@@ -17,7 +17,7 @@ export default Ember.Mixin.create({
   uiDragEvents: [ 'create_drag', 'start_drag', 'drag_drag', 'stop_drag' ],
 
   didInsertElement() {
-    this._super();
+    this._super.init();
 
     // get available options and events
     var options = this._gatherDragOptions();
diff --git a/app/mixins/droppable.js b/app/mixins/droppable.js
index 7e557e8..203ab21 100644
--- a/app/mixins/droppable.js
+++ b/app/mixins/droppable.js
@@ -16,7 +16,7 @@ export default Ember.Mixin.create({
     'out_drop', 'drop_drop' ],
 
   didInsertElement() {
-    this._super();
+    this._super.init();
 
     // get available options and events
     var options = this._gatherDropOptions();
diff --git a/app/mixins/live-data.js b/app/mixins/live-data.js
index 059c2a4..2ba081e 100644
--- a/app/mixins/live-data.js
+++ b/app/mixins/live-data.js
@@ -20,7 +20,7 @@ export default Ember.Mixin.create({
   _sockets: {},
 
   init: function() {
-    this._super();
+    this._super.init();
 
     // fetch the simulations for the first time
     this._fetchRunningSimulations();
diff --git a/app/mixins/resizable.js b/app/mixins/resizable.js
index 28a1073..50c1383 100644
--- a/app/mixins/resizable.js
+++ b/app/mixins/resizable.js
@@ -18,7 +18,7 @@ export default Ember.Mixin.create({
   uiResizeEvents: [ 'create_resize', 'start_resize', 'resize_resize', 'stop_resize' ],
 
   didInsertElement() {
-    this._super();
+    this._super.init();
 
     // get available options and events
     var options = this._gatherResizeOptions();
diff --git a/app/mixins/sortable.js b/app/mixins/sortable.js
index 737367f..a69d4e8 100644
--- a/app/mixins/sortable.js
+++ b/app/mixins/sortable.js
@@ -21,7 +21,7 @@ export default Ember.Mixin.create({
     'sort_sort', 'start_sort', 'stop_sort', 'update_sort' ],
 
   didInsertElement() {
-    this._super();
+    this._super.init();
 
     // get available options and events
     var options = this._gatherSortOptions();
diff --git a/app/services/session-user.js b/app/services/session-user.js
index ed736ac..06b94b9 100644
--- a/app/services/session-user.js
+++ b/app/services/session-user.js
@@ -24,7 +24,7 @@ export default Ember.Service.extend({
     return new RSVP.Promise((resolve, reject) => {
       const token = this.get('session.data.authenticated.token');
       if (!Ember.isEmpty(token)) {
-        return this.get('store').findRecord('user', 'me').then(function(user) {
+        return this.get('store').queryRecord('user', 'me').then(function(user) {
           _this.set('user', user);
           resolve();
         }, function() {