1
0
Fork 0

erge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Mark 2016-06-16 08:21:55 +01:00
commit faf599f41d
2 changed files with 13 additions and 2 deletions

View File

@ -89,6 +89,7 @@
if (refetch) { if (refetch) {
this.collection.fetch({ this.collection.fetch({
cache: false,
success: function() { success: function() {
callback(); callback();
} }
@ -213,6 +214,7 @@
var self = this; var self = this;
this.collection.fetch({ this.collection.fetch({
cache: false,
success: function() { success: function() {
self.collection.sort(); self.collection.sort();
@ -303,7 +305,9 @@
editGraph : function(e) { editGraph : function(e) {
e.stopPropagation(); e.stopPropagation();
this.collection.fetch(); this.collection.fetch({
cache: false
});
this.graphToEdit = this.evaluateGraphName($(e.currentTarget).attr("id"), '_settings'); this.graphToEdit = this.evaluateGraphName($(e.currentTarget).attr("id"), '_settings');
var graph = this.collection.findWhere({_key: this.graphToEdit}); var graph = this.collection.findWhere({_key: this.graphToEdit});
this.createEditGraphModal( this.createEditGraphModal(
@ -469,6 +473,7 @@
updateGraphManagementView: function() { updateGraphManagementView: function() {
var self = this; var self = this;
this.collection.fetch({ this.collection.fetch({
cache: false,
success: function() { success: function() {
self.render(); self.render();
} }

View File

@ -49,6 +49,7 @@
//fetch collection defined in router //fetch collection defined in router
this.collection.fetch({ this.collection.fetch({
cache: false,
success: function() { success: function() {
self.collection.whoAmI(callback); self.collection.whoAmI(callback);
} }
@ -107,6 +108,7 @@
}.bind(this); }.bind(this);
this.collection.fetch({ this.collection.fetch({
cache: false,
success: function() { success: function() {
callbackFunction(); callbackFunction();
} }
@ -193,6 +195,7 @@
updateUserManagement: function() { updateUserManagement: function() {
var self = this; var self = this;
this.collection.fetch({ this.collection.fetch({
cache: false,
success: function() { success: function() {
self.render(); self.render();
} }
@ -208,7 +211,9 @@
e.currentTarget = $(e.currentTarget).find('img'); e.currentTarget = $(e.currentTarget).find('img');
} }
this.collection.fetch(); this.collection.fetch({
cache: false
});
var username = this.evaluateUserName($(e.currentTarget).attr("id"), '_edit-user'); var username = this.evaluateUserName($(e.currentTarget).attr("id"), '_edit-user');
if (username === '') { if (username === '') {
username = $(e.currentTarget).attr('id'); username = $(e.currentTarget).attr('id');
@ -275,6 +280,7 @@
updateUserProfile: function() { updateUserProfile: function() {
var self = this; var self = this;
this.collection.fetch({ this.collection.fetch({
cache: false,
success: function() { success: function() {
self.render(); self.render();
} }