X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fxoslib%2Fstatic%2Fjs%2FxosTenant.js;h=9c45460a3039fc6c3e036d06034d9e1c001a11c1;hb=b4fcd4005bcebbafc988a2e6bc0d2da2b7ffc908;hp=fc510f3450fbb35d72250165f6c48514bd639eae;hpb=9496740998d3d5aeaf3c2f76b312f309c15c4f60;p=plstackapi.git
diff --git a/planetstack/core/xoslib/static/js/xosTenant.js b/planetstack/core/xoslib/static/js/xosTenant.js
index fc510f3..9c45460 100644
--- a/planetstack/core/xoslib/static/js/xosTenant.js
+++ b/planetstack/core/xoslib/static/js/xosTenant.js
@@ -30,7 +30,7 @@ XOSTenantSiteCollection = XOSCollection.extend( {
putToSlice: function(slice) {
slice.attributes.site_allocation = {};
for (index in this.models) {
- model = this.models[index];
+ var model = this.models[index];
slice.attributes.site_allocation[ model.attributes.name ] = model.attributes.allocated;
}
},
@@ -75,6 +75,7 @@ XOSTenantButtonView = Marionette.ItemView.extend({
saveClicked: function(e) {
model = this.options.linkedView.model;
model.tenantSiteCollection.putToSlice(model);
+ model.attributes.users = model.usersBuffer;
this.options.linkedView.submitContinueClicked.call(this.options.linkedView, e);
},
});
@@ -101,7 +102,12 @@ XOSTenantApp.buildViews = function() {
tenantSummaryClass = XOSDetailView.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;
@@ -124,6 +130,9 @@ XOSTenantApp.buildViews = function() {
title: "sites",
inputType: {allocated: "spinner"},
noDeleteColumn: true,
+ disablePaginate: true,
+ disableFilter: true,
+ fieldDisplayNames: {"name": "Site"},
});
XOSTenantApp.tenantSiteListView = tenantSiteListClass;
@@ -167,6 +176,12 @@ XOSTenantApp.adjustCollectionField = function(collectionName, id, fieldName, amo
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 + "_"});
console.log(model);
@@ -181,7 +196,7 @@ XOSTenantApp.addSlice = function() {
modal: true,
width: 640,
buttons : {
- "Save" : function() {
+ "Create Slice" : function() {
var addDialog = this;
console.log("SAVE!!!");
detailView.synchronous = true;
@@ -206,11 +221,11 @@ XOSTenantApp.editUsers = function(model) {
modal: true,
width: 640,
buttons : {
- "Save" : function() {
+ "Ok" : function() {
var editDialog = this;
user_ids = all_options($("#tenant-edit-users-dialog").find(".select-picker-to"));
user_ids = user_ids.map( function(x) { return parseInt(x,10); } );
- model.attributes.users = user_ids;
+ model.usersBuffer = user_ids;
$(editDialog).dialog("close");
},
"Cancel" : function() {
@@ -231,31 +246,43 @@ XOSTenantApp.viewSlice = function(model) {
model = xos.slicesPlus.models[0];
}
- sliceSelector = new XOSTenantApp.tenantSliceSelectorView({collection: xos.slicesPlus,
- selectedID: model.id,
- } );
- XOSTenantApp.sliceSelector = sliceSelector;
- XOSTenantApp.tenantSliceSelector.show(sliceSelector);
+ if (model) {
+ sliceSelector = new XOSTenantApp.tenantSliceSelectorView({collection: xos.slicesPlus,
+ selectedID: model ? model.id : null,
+ } );
+ XOSTenantApp.sliceSelector = sliceSelector;
+ XOSTenantApp.tenantSliceSelector.show(sliceSelector);
- tenantSummary = new XOSTenantApp.tenantSummaryView({model: model,
- choices: {mount_data_sets: make_choices(xos.tenant().public_volume_names, null),
- serviceClass: make_choices(xos.tenant().blessed_service_class_names, xos.tenant().blessed_service_classes),
- default_image: make_choices(xos.tenant().blessed_image_names, xos.tenant().blessed_images),
- default_flavor: make_choices(xos.tenant().blessed_flavor_names, xos.tenant().blessed_flavors),},
- });
- XOSTenantApp.tenantSummary.show(tenantSummary);
+ tenantSummary = new XOSTenantApp.tenantSummaryView({model: model,
+ choices: {mount_data_sets: make_choices(xos.tenant().public_volume_names, null),
+ serviceClass: make_choices(xos.tenant().blessed_service_class_names, xos.tenant().blessed_service_classes),
+ default_image: make_choices(xos.tenant().blessed_image_names, xos.tenant().blessed_images),
+ default_flavor: make_choices(xos.tenant().blessed_flavor_names, xos.tenant().blessed_flavors),},
+ });
+ XOSTenantApp.tenantSummary.show(tenantSummary);
- tenantSites = new XOSTenantSiteCollection();
- tenantSites.getFromSlice(model);
- model.tenantSiteCollection = tenantSites;
- XOSTenantApp.tenantSites = tenantSites;
+ 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;
- tenantSiteList = new XOSTenantApp.tenantSiteListView({collection: tenantSites });
- XOSTenantApp.tenantSiteList.show(tenantSiteList);
- // on xos.slicePlus.sort, need to update xostenantapp.tenantSites
+ tenantSiteList = new XOSTenantApp.tenantSiteListView({collection: tenantSites });
+ XOSTenantApp.tenantSiteList.show(tenantSiteList);
+ // on xos.slicePlus.sort, need to update xostenantapp.tenantSites
- XOSTenantApp.tenantButtons.show( new XOSTenantButtonView( { app: XOSTenantApp,
- linkedView: tenantSummary } ) );
+ XOSTenantApp.tenantButtons.show( new XOSTenantButtonView( { app: XOSTenantApp,
+ linkedView: tenantSummary } ) );
+ } else {
+ XOSTenantApp.tenantSliceSelector.show(new HTMLView({html: ""}));
+ XOSTenantApp.tenantSummary.show(new HTMLView({html: "You have no slices"}));
+ XOSTenantApp.tenantSiteList.show(new HTMLView({html: ""}));
+ XOSTenantApp.tenantButtons.show( new XOSTenantButtonView( { template: "#xos-tenant-buttons-noslice-template",
+ app: XOSTenantApp,
+ linkedView: tenantSummary } ) );
+ }
};
XOSTenantApp.sanityCheck = function() {
@@ -272,6 +299,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("
"));