Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emulab-devel
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
143
Issues
143
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
emulab
emulab-devel
Commits
74e3d7c0
Commit
74e3d7c0
authored
Feb 12, 2019
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes to previous revision.
parent
bde6c94d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
7 deletions
+16
-7
www/aptui/js/instantiate-new.js
www/aptui/js/instantiate-new.js
+5
-4
www/aptui/js/manage_profile.js
www/aptui/js/manage_profile.js
+3
-0
www/aptui/js/show-profile.js
www/aptui/js/show-profile.js
+2
-1
www/aptui/manage_profile.ajax
www/aptui/manage_profile.ajax
+6
-2
No files found.
www/aptui/js/instantiate-new.js
View file @
74e3d7c0
...
...
@@ -1741,7 +1741,7 @@ $(function ()
json
.
value
.
repohash
=
hash
;
if
(
pythonRe
.
test
(
source
))
{
ConvertScript
(
source
,
function
(
rspec
,
paramdefs
)
{
ConvertScript
(
source
,
profile
,
function
(
rspec
,
paramdefs
)
{
// Need to pass these along at submit.
$
(
'
#rspec_textarea
'
).
val
(
rspec
);
$
(
'
#script_textarea
'
).
val
(
source
);
...
...
@@ -1780,7 +1780,7 @@ $(function ()
// We use this on repo-based profiles, where we have to get the
// source code from the repo, and convert to an rspec.
//
function
ConvertScript
(
script
,
continuation
)
function
ConvertScript
(
script
,
profile_uuid
,
continuation
)
{
var
callback
=
function
(
json
)
{
sup
.
HideWaitWait
();
...
...
@@ -1801,8 +1801,9 @@ $(function ()
var
xmlthing
=
sup
.
CallServerMethod
(
null
,
"
manage_profile
"
,
"
CheckScript
"
,
{
"
script
"
:
script
,
"
getparams
"
:
true
});
{
"
script
"
:
script
,
"
profile_uuid
"
:
profile_uuid
,
"
getparams
"
:
true
});
xmlthing
.
done
(
callback
);
}
...
...
www/aptui/js/manage_profile.js
View file @
74e3d7c0
...
...
@@ -1399,6 +1399,9 @@ $(function ()
// Pass along uuid as a flag to update repo.
args
[
"
repoupdate
"
]
=
version_uuid
;
}
if
(
profile_uuid
)
{
args
[
"
profile_uuid
"
]
=
profile_uuid
;
}
WaitWait
(
"
We are converting your geni-lib script to XML
"
);
var
xmlthing
=
sup
.
CallServerMethod
(
ajaxurl
,
"
manage_profile
"
,
...
...
www/aptui/js/show-profile.js
View file @
74e3d7c0
...
...
@@ -365,7 +365,8 @@ $(function ()
var
xmlthing
=
sup
.
CallServerMethod
(
ajaxurl
,
"
manage_profile
"
,
"
CheckScript
"
,
{
"
script
"
:
script
});
{
"
script
"
:
script
,
"
profile_uuid
"
:
profile_uuid
});
xmlthing
.
done
(
callback
);
}
...
...
www/aptui/manage_profile.ajax
View file @
74e3d7c0
...
...
@@ -739,8 +739,12 @@ function Do_CheckScript()
$command
.
=
" -P
$pfname
"
;
}
if
(
$profile
->
UseNewGeniLib
(
$this_user
))
{
$command
.
=
" -N "
;
if
(
isset
(
$ajax_args
[
"profile_uuid"
]))
{
$profile
=
Profile
::
Lookup
(
$ajax_args
[
"profile_uuid"
]);
if
(
$profile
&&
$profile
->
UseNewGeniLib
(
$this_user
))
{
$command
.
=
" -N "
;
}
}
}
elseif
(
preg_match
(
"/^source tb_compat/m"
,
$ajax_args
[
"script"
]))
{
...
...
Write
Preview
Markdown
is supported
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