...
 
Commits (2)
......@@ -471,7 +471,7 @@ function Do_Clone()
{
global $this_user, $ajax_args;
global $TBBASE, $ISEMULAB, $TBMAINSITE, $OURDOMAIN;
global $TB_PROJECT_MAKEIMAGEID, $TB_NODEACCESS_LOADIMAGE; $suexec_output;
global $TB_PROJECT_MAKEIMAGEID, $TB_NODEACCESS_LOADIMAGE, $suexec_output;
global $TB_IMAGEID_MODIFYINFO, $TB_IMAGEID_READINFO;
$this_idx = $this_user->uid_idx();
......@@ -622,11 +622,13 @@ function Do_Clone()
}
$args["noexport"] = $baseimage->noexport();
$args["mbr_version"] = $baseimage->mbr_version();
$args["reboot_waittime"] = $baseinfo->reboot_waittime();
$args["osfeatures"] = $baseinfo->osfeatures();
if ($baseimage->architecture()) {
$args["architecture"] = $baseimage->architecture();
}
if ($baseinfo->reboot_waittime() && $baseinfo->reboot_waittime() != "") {
$args["reboot_waittime"] = $baseinfo->reboot_waittime();
}
# Send the type array anyway.
foreach ($baseimage->Types() as $type) {
$args["mtype_$type"] = 1;
......
......@@ -16,14 +16,6 @@
col-xs-12'>
<div class='panel panel-default'>
<div class='panel-heading'>
<% if (isadmin && window.ISEMULAB) { %>
<a href="../newimageid_ez.php3?imageid=<%= window.BASEIMAGE_UUID %>&classic=1"
class='btn btn-primary btn-xs pull-right'
style='margin-right: 10px; margin-top: -4px;'
data-toggle='tooltip'
title="Classic new image page"
type='button'>Classic</a>
<% } %>
<h3 class='panel-title'>Clone Image</h3>
</div>
<div class='panel-body'>
......