X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fxoslib%2Fstatic%2Fjs%2FxosTenant.js;h=10e70e62907f3c7403f41ddd2ca331f64c6ec951;hb=d7020d06768e4cec644a3b26802212de4ba56e65;hp=48ac835e34511feee66dadf629ff8cad7c331bef;hpb=9a0cf3ac9db8a99b8f9477b8798c076d87645b42;p=plstackapi.git
diff --git a/planetstack/core/xoslib/static/js/xosTenant.js b/planetstack/core/xoslib/static/js/xosTenant.js
index 48ac835..10e70e6 100644
--- a/planetstack/core/xoslib/static/js/xosTenant.js
+++ b/planetstack/core/xoslib/static/js/xosTenant.js
@@ -50,6 +50,20 @@ XOSEditUsersView = Marionette.ItemView.extend({
});
+XOSTenantSummaryView = XOSDetailView.extend({
+ events: {"change": "onChange"},
+
+ onChange: function(e) {
+ XOSTenantApp.setDirty(true);
+ },
+
+ saveSuccess: function() {
+ console.log("saveSuccess!");
+ XOSTenantApp.setDirty(false);
+ },
+
+ });
+
XOSTenantButtonView = Marionette.ItemView.extend({
template: "#xos-tenant-buttons-template",
@@ -76,7 +90,11 @@ XOSTenantButtonView = Marionette.ItemView.extend({
model = this.options.linkedView.model;
model.tenantSiteCollection.putToSlice(model);
model.attributes.users = model.usersBuffer;
- this.options.linkedView.submitContinueClicked.call(this.options.linkedView, e);
+
+ e.preventDefault();
+ this.options.linkedView.save();
+ //this.options.linkedView.submitContinueClicked.call(this.options.linkedView, e);
+ //XOSTenantApp.setDirty(false);
},
});
@@ -96,13 +114,26 @@ XOSTenantApp.addRegions({
tenantEditUsersInterior: "#tenant-edit-users-interior",
});
+XOSTenantApp.setDirty = function(dirty) {
+ if (dirty) {
+ $("button.btn-tenant-save").addClass("btn-success");
+ } else {
+ $("button.btn-tenant-save").removeClass("btn-success");
+ }
+};
+
XOSTenantApp.buildViews = function() {
XOSTenantApp.tenantSites = new XOSTenantSiteCollection();
- tenantSummaryClass = XOSDetailView.extend({template: "#xos-detail-template",
+ tenantSummaryClass = XOSTenantSummaryView.extend({template: "#xos-detail-template",
app: XOSTenantApp,
detailFields: ["serviceClass", "default_image", "default_flavor", "network_ports", "mount_data_sets"],
- fieldDisplayNames: {serviceClass: "Service Level", "default_flavor": "Flavor", "default_image": "Image"},
+ fieldDisplayNames: {serviceClass: "Service Level", "default_flavor": "Flavor", "default_image": "Image", "mount_data_sets": "Data Sets"},
+
+ onShow: function() {
+ // the slice selector is in a different table, so make every label cell the maximal width
+ make_same_width("#xos-tenant-view-panel", ".xos-label-cell");
+ },
});
XOSTenantApp.tenantSummaryView = tenantSummaryClass;
@@ -125,6 +156,9 @@ XOSTenantApp.buildViews = function() {
title: "sites",
inputType: {allocated: "spinner"},
noDeleteColumn: true,
+ disablePaginate: true,
+ disableFilter: true,
+ fieldDisplayNames: {"name": "Site"},
});
XOSTenantApp.tenantSiteListView = tenantSiteListClass;
@@ -164,16 +198,24 @@ XOSTenantApp.navToSlice = function(id) {
XOSTenantApp.adjustCollectionField = function(collectionName, id, fieldName, amount) {
model = XOSTenantApp[collectionName].get(id);
model.set(fieldName, Math.max(model.get(fieldName) + amount, 0));
+ XOSTenantApp.setDirty(true);
};
XOSTenantApp.addSlice = function() {
var app=this;
+
+ if (!xos.tenant().current_user_can_create_slice) {
+ window.alert("You do not have sufficient rights to create a slice on your site");
+ return;
+ }
+
model = new xos.slicesPlus.model({site: xos.tenant().current_user_site_id,
- name: xos.tenant().current_user_login_base + "_"});
+ name: xos.tenant().current_user_login_base + "_",
+ creator: xos.tenant().current_user_id});
console.log(model);
var detailView = new XOSTenantApp.tenantAddView({model: model,
- collection: xos.slicesPlus,
- noSubmitButton: true,
+ collection: xos.slicesPlus,
+ noSubmitButton: true,
});
detailView.dialog = $("#tenant-addslice-dialog");
app.tenantAddSliceInterior.show(detailView);
@@ -250,6 +292,8 @@ XOSTenantApp.viewSlice = function(model) {
tenantSites = new XOSTenantSiteCollection();
tenantSites.getFromSlice(model);
model.usersBuffer = model.attributes.users; /* save a copy of 'users' that we can edit. This prevents another view (developer) from overwriting our copy with a fetch from the server */
+ model.usersOrig = model.attributes.users; /* save an immutable copy that we'll use for username lookups */
+ model.user_namesOrig = model.attributes.user_names;
model.tenantSiteCollection = tenantSites;
XOSTenantApp.tenantSites = tenantSites;
@@ -283,6 +327,9 @@ XOSTenantApp.sanityCheck = function() {
if (xos.tenant().blessed_sites.length == 0) {
errors.push("no blessed sites");
}
+ if (xos.tenant().current_user_site_id == null) {
+ errors.push("current user does not have a site");
+ }
if (errors.length > 0) {
$("#tenantSummary").html("Tenant view sanity check failed
" + errors.join("
"));