Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed chaning collection properties in cluster

This commit is contained in:
hkernbach 2016-06-17 11:55:08 +02:00
parent 7bcc7b33f3
commit 34805003fe
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsItemView.js
View File

@ -1,6 +1,6 @@
/*jshint browser: true */ /*jshint browser: true */
/*jshint unused: false */ /*jshint unused: false */
/*global window, exports, Backbone, EJS, _, $, templateEngine, arangoHelper, Joi*/ /*global window, frontendConfig, exports, Backbone, EJS, _, $, templateEngine, arangoHelper, Joi*/
(function() { (function() {
"use strict"; "use strict";
@ -212,7 +212,12 @@
} }
}.bind(this); }.bind(this);
this.model.renameCollection(newname, callbackRename); if (frontendConfig.isCluster === false) {
this.model.renameCollection(newname, callbackRename);
}
else {
callbackRename();
}
} }
else if (status === 'unloaded') { else if (status === 'unloaded') {
if (this.model.get('name') !== newname) { if (this.model.get('name') !== newname) {
@ -227,7 +232,12 @@
} }
}.bind(this); }.bind(this);
this.model.renameCollection(newname, callbackRename2); if (frontendConfig.isCluster === false) {
this.model.renameCollection(newname, callbackRename2);
}
else {
callbackRename2();
}
} }
else { else {
window.modalView.hide(); window.modalView.hide();

16
js/apps/system/_admin/aardvark/APP/frontend/js/views/settingsView.js
View File

@ -1,6 +1,6 @@
/*jshint browser: true */ /*jshint browser: true */
/*jshint unused: false */ /*jshint unused: false */
/*global arangoHelper, Joi, Backbone, window, templateEngine, $ */ /*global frontendConfig, arangoHelper, Joi, Backbone, window, templateEngine, $ */
(function() { (function() {
"use strict"; "use strict";
@ -155,7 +155,12 @@
} }
}.bind(this); }.bind(this);
this.model.renameCollection(newname, callbackRename); if (frontendConfig.isCluster === false) {
this.model.renameCollection(newname, callbackRename);
}
else {
callbackRename();
}
} }
else if (status === 'unloaded') { else if (status === 'unloaded') {
if (this.model.get('name') !== newname) { if (this.model.get('name') !== newname) {
@ -170,7 +175,12 @@
} }
}.bind(this); }.bind(this);
this.model.renameCollection(newname, callbackRename2); if (frontendConfig.isCluster === false) {
this.model.renameCollection(newname, callbackRename2);
}
else {
callbackRename2();
}
} }
else { else {
window.modalView.hide(); window.modalView.hide();