Mirrors/VILLASweb
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00
Code Issues Releases Wiki Activity

Minor fixes

Browse source
This commit is contained in:
Markus Grigull 2017-02-03 15:02:35 +01:00
parent ed6ea99d14
commit 31c3c9bf33
8 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/adapters/application.js
View file

@ -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;
}
});

2
app/components/widget-plot.js
View file

@ -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;

2
app/mixins/draggable.js
View file

@ -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();

2
app/mixins/droppable.js
View file

@ -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();

2
app/mixins/live-data.js
View file

@ -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();

2
app/mixins/resizable.js
View file

@ -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();

2
app/mixins/sortable.js
View file

@ -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();

2
app/services/session-user.js
View file

@ -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() {