Commit 9d81051c authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Merge branch 'mymaster'

parents d5a76125 23d91567
...@@ -60,10 +60,7 @@ function (_, Constraints, sup, ppstart, JacksEditor, aboutaptString, aboutcloudS ...@@ -60,10 +60,7 @@ function (_, Constraints, sup, ppstart, JacksEditor, aboutaptString, aboutcloudS
{uuid : selected_uuid, {uuid : selected_uuid,
registered : registered, registered : registered,
isadmin : isadmin, isadmin : isadmin,
amlist : amlist,
amdefault : amdefault,
callback : ConfigureDone, callback : ConfigureDone,
button_label : "Accept",
rspec : rspec :
(!window.SKIPSTEPS ? null : (!window.SKIPSTEPS ? null :
$('#pp_rspec_textarea').val()), $('#pp_rspec_textarea').val()),
...@@ -486,20 +483,12 @@ function (_, Constraints, sup, ppstart, JacksEditor, aboutaptString, aboutcloudS ...@@ -486,20 +483,12 @@ function (_, Constraints, sup, ppstart, JacksEditor, aboutaptString, aboutcloudS
/* /*
* Callback from the PP configurator. Stash rspec into the form. * Callback from the PP configurator. Stash rspec into the form.
*/ */
function ConfigureDone(newRspec, where) { function ConfigureDone(newRspec) {
// If not a registered user, we do not get an rspec back, since // If not a registered user, we do not get an rspec back, since
// the user is not allowed to change the configuration. // the user is not allowed to change the configuration.
if (newRspec) { if (newRspec) {
$('#pp_rspec_textarea').val(newRspec); $('#pp_rspec_textarea').val(newRspec);
} CreateAggregateSelectors(newRspec);
// Need to change the form before submit.
if (where && $('#profile_where').length) {
// Deselect current option.
$('#profile_where option').prop("selected", false);
// Find and select new option.
$('#profile_where option')
.filter('[value="'+ where + '"]')
.prop('selected', true);
} }
// Enable the create button. // Enable the create button.
$('#instantiate_submit').attr('disabled', false); $('#instantiate_submit').attr('disabled', false);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment