* Fix bug #39230.
This commit is contained in:
@@ -46,6 +46,7 @@ $(function()
|
||||
*/
|
||||
function checkMemory()
|
||||
{
|
||||
$('#submitBtn').attr('disabled', true);
|
||||
var apps = [];
|
||||
$.each(category, (index, cate) =>
|
||||
{
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
</table>
|
||||
<div class='text-center form-actions'>
|
||||
<?php echo html::a(inlink('step6'), $lang->install->solution->skip, '', "id='skipBtn' class='btn btn-install btn-wide' style='display:none;'");?>
|
||||
<?php echo html::commonButton($lang->solution->install, "id='submitBtn'", 'btn btn-primary btn-wide')?>
|
||||
<?php echo html::commonButton($lang->solution->install, "id='submitBtn' disabled=disabled", 'btn btn-primary btn-wide')?>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
@@ -928,7 +928,9 @@ class InstanceModel extends model
|
||||
*/
|
||||
public function createInstance($app, $space, $thirdDomain, $name = '', $k8name = '', $channel = 'stable', $snippets = array())
|
||||
{
|
||||
$createdBy = $this->app->user->account;
|
||||
if(empty($k8name)) $k8name = "{$app->chart}-" . date('YmdHis'); //name rule: chartName-userAccount-YmdHis;
|
||||
if(IN_INSTALL && empty($this->app->user->account)) $createdBy = trim($this->app->company->admins, ','); //Set createdBy if in login progress;
|
||||
|
||||
$instanceData = new stdclass;
|
||||
$instanceData->appId = $app->id;
|
||||
|
||||
Reference in New Issue
Block a user