diff --git a/module/instance/control.php b/module/instance/control.php index 12efc4f52c..26c50f0721 100644 --- a/module/instance/control.php +++ b/module/instance/control.php @@ -42,37 +42,43 @@ class instance extends control { if(!commonModel::hasPriv('space', 'browse')) $this->loadModel('common')->deny('space', 'browse', false); - if($type === 'store') return $this->storeView($id, $tab); + if($type === 'store') + { + $this->storeView($id, $tab); + } + else + { + $instance = $this->loadModel('gitea')->fetchByID($id); + $instance->status = ''; + $instance->source = 'user'; + $instance->externalID = $instance->id; + $instance->runDuration = 0; + $instance->appName = $instance->type; + $instance->createdAt = $instance->createdDate; - $instance = $this->loadModel('gitea')->fetchByID($id); - $instance->status = ''; - $instance->source = 'user'; - $instance->externalID = $instance->id; - $instance->runDuration = 0; - $instance->appName = $instance->type; - $instance->createdAt = $instance->createdDate; + $instanceMetric = new stdclass(); + $instanceMetric->cpu = 0; + $instanceMetric->memory = 0; - $instanceMetric = new stdclass(); - $instanceMetric->cpu = 0; - $instanceMetric->memory = 0; + $this->view->title = $instance->name; + $this->view->instance = $instance; + $this->view->cloudApp = array(); + $this->view->seniorAppList = array(); + $this->view->actions = $this->loadModel('action')->getList($instance->type, $id); + $this->view->defaultAccount = ''; + $this->view->instanceMetric = $instanceMetric; + $this->view->currentResource = ''; + $this->view->customItems = array(); + $this->view->backupList = array(); + $this->view->hasRestoreLog = false; + $this->view->latestBackup = array(); + $this->view->dbList = array(); + $this->view->domain = ''; + } - $this->view->title = $instance->name; - $this->view->instance = $instance; - $this->view->cloudApp = array(); - $this->view->seniorAppList = array(); - $this->view->actions = $this->loadModel('action')->getList($instance->type, $id); - $this->view->defaultAccount = ''; - $this->view->instanceMetric = $instanceMetric; - $this->view->currentResource = ''; - $this->view->customItems = array(); - $this->view->backupList = array(); - $this->view->hasRestoreLog = false; - $this->view->latestBackup = array(); - $this->view->dbList = array(); - $this->view->domain = ''; - $this->view->users = $this->loadModel('user')->getPairs('noletter'); - $this->view->tab = $tab; - $this->view->type = $type; + $this->view->users = $this->loadModel('user')->getPairs('noletter'); + $this->view->tab = $tab; + $this->view->type = $type; $this->display(); } @@ -100,7 +106,6 @@ class instance extends control $instanceMetric = $this->cne->instancesMetrics(array($instance)); $instanceMetric = $instanceMetric[$instance->id]; - $this->lang->switcherMenu = $this->instance->getSwitcher($instance); $backupList = array(); $latestBackup = new stdclass;