Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
0a63deac
Commit
0a63deac
authored
Sep 23, 2015
by
Keith Downie
Committed by
Leigh B Stoller
Sep 24, 2015
Browse files
Fix for errors on instantiate page getting hidden by wizard
parent
18e39e98
Changes
2
Hide whitespace changes
Inline
Side-by-side
www/aptui/instantiate.php
View file @
0a63deac
...
...
@@ -349,14 +349,6 @@ function SPITFORM($formfields, $newuser, $errors)
echo
" <fieldset>
\n
"
;
#
# Look for non-specific error.
#
if
(
$errors
&&
array_key_exists
(
"error"
,
$errors
))
{
echo
"<font color=red><center>"
.
$errors
[
"error"
]
.
"</center></font><br>"
;
}
#
# Ask for user information
#
...
...
@@ -638,8 +630,15 @@ function SPITFORM($formfields, $newuser, $errors)
<div id='finalize_container' class='col-lg-8 col-md-8 col-sm-8 col-xs-12'>
<div class='panel panel-default'>
<div class='panel-heading'>Please review the selections below and then click Finish.</div>
<div class='panel-body'>
<div id='finalize_options'></div>
<div class='panel-body'>
\n
"
;
#
# Look for non-specific error.
#
if
(
$errors
&&
array_key_exists
(
"error"
,
$errors
))
{
echo
"<div style='margin-bottom: 10px;'><font color=red><center>"
.
$errors
[
"error"
]
.
"</center></font></div>"
;
}
echo
"<div id='finalize_options'></div>
</div>
</div>
</div>
...
...
@@ -648,6 +647,8 @@ function SPITFORM($formfields, $newuser, $errors)
<div id='inline_jacks'></div>
</div>
</div>
\n
"
;
echo
"</div>
\n
"
;
echo
"<button class='btn btn-primary btn-sm'
style='display:block;visibility:hidden;'
...
...
www/aptui/js/instantiate.js
View file @
0a63deac
...
...
@@ -479,10 +479,12 @@ function (_, Constraints, sup, ppstart, JacksEditor, aboutaptString, aboutcloudS
.
prop
(
'
selected
'
,
true
);
}
if
(
window
.
SKIPSTEPS
)
{
$
(
'
#stepsContainer
'
).
steps
(
"
next
"
);
if
(
ispprofile
)
{
$
(
'
#stepsContainer
'
).
steps
(
"
next
"
);
}
if
(
!
$
(
'
#stepsContainer-p-0 fieldset > .has-error
'
).
length
)
{
$
(
'
#stepsContainer
'
).
steps
(
"
next
"
);
if
(
ispprofile
)
{
$
(
'
#stepsContainer
'
).
steps
(
"
next
"
);
}
}
window
.
SKIPSTEPS
=
0
;
}
updateWhere
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment