From 8998e210262382640111ce0e632984f237e4e53d Mon Sep 17 00:00:00 2001
From: zhaoke <zhaoke@easycorp.ltd>
Date: Tue, 1 Aug 2023 17:00:02 +0800
Subject: [PATCH] * Fix notice of devops.

---
 lib/zin/wg/tree/v1.php               |  4 +++-
 module/account/ui/browse.html.php    |  2 +-
 module/account/ui/create.html.php    |  7 -------
 module/common/lang/de.php            |  2 ++
 module/common/lang/en.php            |  3 ++-
 module/common/lang/fr.php            |  2 ++
 module/common/lang/vi.php            | 13 ++++++++-----
 module/common/lang/zh-tw.php         |  3 +++
 module/common/model.php              |  2 +-
 module/compile/model.php             |  2 +-
 module/host/ui/create.html.php       | 23 ++++-------------------
 module/host/ui/edit.html.php         |  2 +-
 module/instance/model.php            |  1 +
 module/mr/control.php                |  2 +-
 module/pipeline/model.php            |  2 +-
 module/serverroom/ui/create.html.php |  6 ------
 module/space/ui/browse.html.php      |  2 +-
 module/tree/lang/de.php              | 11 +++++++++--
 18 files changed, 41 insertions(+), 48 deletions(-)

diff --git a/lib/zin/wg/tree/v1.php b/lib/zin/wg/tree/v1.php
index 5a23ef5879..59a371ee08 100644
--- a/lib/zin/wg/tree/v1.php
+++ b/lib/zin/wg/tree/v1.php
@@ -5,8 +5,8 @@ namespace zin;
 class tree extends wg
 {
     protected static array $defineProps = array(
-        'type: string',
         'items: array',
+        'type?: string',
         'id?: string',
         'icon?: string',
         'class?: string',
@@ -39,6 +39,8 @@ class tree extends wg
         {
             $item = (array)$item;
             if(!isset($item['text'])) $item['text'] = $item['name'];
+            if(!isset($item['url']))  $item['url'] = '';
+            if(!isset($item['type'])) $item['type'] = '';
 
             if($item['type'] == 'product')
             {
diff --git a/module/account/ui/browse.html.php b/module/account/ui/browse.html.php
index 166365cabf..621402398b 100644
--- a/module/account/ui/browse.html.php
+++ b/module/account/ui/browse.html.php
@@ -31,7 +31,7 @@ jsVar('sortLink', helper::createLink('account', 'browse', "browseType=$browseTyp
 
 dtable
 (
-    set::userMap($users),
+    set::userMap($accountList),
     set::cols(array_values($config->account->dtable->fieldList)),
     set::data($tableData),
     set::sortLink(jsRaw('createSortLink')),
diff --git a/module/account/ui/create.html.php b/module/account/ui/create.html.php
index efcd3e556e..24188cc3e7 100644
--- a/module/account/ui/create.html.php
+++ b/module/account/ui/create.html.php
@@ -22,7 +22,6 @@ formPanel
         (
             set::name('name'),
             set::label($lang->account->name),
-            set::value($account->name),
         )
     ),
     formRow
@@ -34,7 +33,6 @@ formPanel
             set::control('picker'),
             set::name('provider'),
             set::items($lang->serverroom->providerList),
-            set::value($account->provider)
         )
     ),
     formRow
@@ -43,7 +41,6 @@ formPanel
         (
             set::name('adminURI'),
             set::label($lang->account->adminURI),
-            set::value($account->adminURI),
         )
     ),
     formRow
@@ -52,7 +49,6 @@ formPanel
         (
             set::name('account'),
             set::label($lang->account->account),
-            set::value($account->account),
         )
     ),
     formRow
@@ -61,7 +57,6 @@ formPanel
         (
             set::name('password'),
             set::label($lang->account->password),
-            set::value($account->password),
         )
     ),
     formRow
@@ -70,7 +65,6 @@ formPanel
         (
             set::name('email'),
             set::label($lang->account->email),
-            set::value($account->email),
         )
     ),
     formRow
@@ -79,7 +73,6 @@ formPanel
         (
             set::name('mobile'),
             set::label($lang->account->mobile),
-            set::value($account->mobile),
         )
     ),
 );
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index b43da11361..8ac9d0155e 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -239,6 +239,8 @@ $lang->zahost->common     = 'ZAhost';
 $lang->zanode->common     = 'ZAnode';
 $lang->dimension->common  = 'Dimension';
 $lang->contact->common    = 'Contacts';
+$lang->space->common      = 'Service';
+$lang->store->common      = 'Store';
 $lang->instance->common   = 'Instance';
 
 $lang->programstakeholder->common = 'Stakeholder';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 3cd6d25efc..f20d742f90 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -241,7 +241,8 @@ $lang->zahost->common       = 'ZAhost';
 $lang->zanode->common       = 'ZAnode';
 $lang->dimension->common    = 'Dimension';
 $lang->contact->common      = 'Contacts';
-$lang->space->common        = 'Services';
+$lang->space->common        = 'Service';
+$lang->store->common        = 'Store';
 $lang->instance->common     = 'Instance';
 
 $lang->programstakeholder->common = 'Stakeholder';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 1ffd9db43f..60ddf5de2c 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -239,6 +239,8 @@ $lang->zahost->common     = 'ZAhost';
 $lang->zanode->common     = 'ZAnode';
 $lang->dimension->common  = 'Dimension';
 $lang->contact->common    = 'Contacts';
+$lang->space->common      = 'Service';
+$lang->store->common      = 'Store';
 $lang->instance->common   = 'Instance';
 
 $lang->programstakeholder->common = 'Stakeholder';
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 54288a19fd..063840bcd3 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -134,11 +134,14 @@ $lang->typeAB       = 'Loại';
 $lang->nameAB       = 'Name';
 
 $lang->common = new stdclass();
-$lang->common->common  = 'Module chung';
-$lang->devops->common  = 'DevOps';
-$lang->repo->codeRepo  = 'Code Repo';
-$lang->app->common     = 'APP';
-$lang->app->serverLink = 'Server Link';
+$lang->common->common   = 'Module chung';
+$lang->devops->common   = 'DevOps';
+$lang->repo->codeRepo   = 'Code Repo';
+$lang->app->common      = 'APP';
+$lang->app->serverLink  = 'Server Link';
+$lang->space->common    = 'Service';
+$lang->store->common    = 'Store';
+$lang->instance->common = 'Instance';
 
 global $config;
 list($programModule, $programMethod)     = explode('-', $config->programLink);
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 8a02e089a3..3059f28500 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -190,6 +190,9 @@ $lang->execution->list    = "{$lang->executionCommon}列表";
 $lang->kanban->common     = '看板';
 $lang->app->common        = '應用';
 $lang->app->serverLink    = '服務器鏈接';
+$lang->space->common      = '服务管理';
+$lang->store->common      = '应用市场';
+$lang->instance->common   = '应用';
 
 $lang->personnel->common     = '人員';
 $lang->personnel->invest     = '投入人員';
diff --git a/module/common/model.php b/module/common/model.php
index d1d3ed68e6..4bf252594f 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -3623,7 +3623,7 @@ EOF;
     }
 
 
-     /**
+    /**
      * Get method of API.
      *
      * @param  string       $url
diff --git a/module/compile/model.php b/module/compile/model.php
index af59c9027c..f741271daa 100644
--- a/module/compile/model.php
+++ b/module/compile/model.php
@@ -382,7 +382,7 @@ class compileModel extends model
         if(!$job) return false;
 
         $compileID = $compile->id;
-        $repo      = $this->loadModel('repo')->getRepoById($job->repo);
+        $repo      = $this->loadModel('repo')->getByID($job->repo);
 
         if($job->triggerType == 'tag')
         {
diff --git a/module/host/ui/create.html.php b/module/host/ui/create.html.php
index 79f0e0a4f1..7fb8edb3f7 100644
--- a/module/host/ui/create.html.php
+++ b/module/host/ui/create.html.php
@@ -23,7 +23,6 @@ formPanel
             set::width('1/3'),
             set::name('name'),
             set::label($lang->host->name),
-            set::value($host->name),
         ),
         formGroup
         (
@@ -32,7 +31,6 @@ formPanel
             set::control('picker'),
             set::name('admin'),
             set::items($accounts),
-            set::value($host->admin)
         )
     ),
     formRow
@@ -44,14 +42,12 @@ formPanel
             set::control('picker'),
             set::name('cpuBrand'),
             set::items($lang->host->cpuBrandList),
-            set::value($host->cpuBrand)
         ),
         formGroup
         (
             set::width('1/3'),
             set::name('cpuModel'),
             set::label($lang->host->cpuModel),
-            set::value($host->cpuModel),
         )
     ),
     formRow
@@ -61,14 +57,12 @@ formPanel
             set::width('1/3'),
             set::name('cpuNumber'),
             set::label($lang->host->cpuNumber),
-            set::value($host->cpuNumber),
         ),
         formGroup
         (
             set::width('1/3'),
             set::name('cpuCores'),
             set::label($lang->host->cpuCores),
-            set::value($host->cpuCores),
         )
     ),
     formRow
@@ -78,7 +72,6 @@ formPanel
             set::width('1/3'),
             set::name('memory'),
             set::label($lang->host->memory),
-            set::value($host->memory),
             set::control(array
             (
                 'type'        => 'inputControl',
@@ -91,7 +84,6 @@ formPanel
             set::width('1/3'),
             set::name('diskSize'),
             set::label($lang->host->diskSize),
-            set::value($host->diskSize),
             set::control(array
             (
                 'type'        => 'inputControl',
@@ -109,7 +101,6 @@ formPanel
             set::control('picker'),
             set::name('group'),
             set::items($optionMenu),
-            set::value($host->group ? $host->group : 0)
         ),
         formGroup
         (
@@ -118,7 +109,6 @@ formPanel
             set::control('picker'),
             set::name('serverRoom'),
             set::items($rooms),
-            set::value($host->serverRoom)
         )
     ),
     formRow
@@ -128,7 +118,6 @@ formPanel
             set::width('1/3'),
             set::name('serverModel'),
             set::label($lang->host->serverModel),
-            set::value($host->serverModel),
         ),
         formGroup
         (
@@ -137,7 +126,7 @@ formPanel
             set::control('picker'),
             set::name('hostType'),
             set::items($lang->host->hostTypeList),
-            set::value($host->hostType ? $host->hostType : 'virtual')
+            set::value('virtual')
         )
     ),
     formRow
@@ -159,7 +148,6 @@ formPanel
             set::control('picker'),
             set::name('osVersion'),
             set::items($lang->host->{"{$osName}List"}),
-            set::value($host->osVersion)
         )
     ),
     formRow
@@ -169,7 +157,7 @@ formPanel
             set::width('1/3'),
             set::name('zap'),
             set::label($lang->host->zap),
-            set::value($host->zap ? $host->zap : 8086),
+            set::value(8086),
         ),
         formGroup
         (
@@ -178,7 +166,7 @@ formPanel
             set::control('picker'),
             set::name('vsoft'),
             set::items($lang->host->tagsList),
-            set::value($host->tags ? $host->tags : 'vm')
+            set::value('vm')
         )
     ),
     formRow
@@ -188,14 +176,12 @@ formPanel
             set::width('1/3'),
             set::name('intranet'),
             set::label($lang->host->intranet),
-            set::value($host->intranet),
         ),
         formGroup
         (
             set::width('1/3'),
             set::name('extranet'),
             set::label($lang->host->extranet),
-            set::value($host->extranet),
         )
     ),
     formRow
@@ -207,7 +193,6 @@ formPanel
             set::control('picker'),
             set::name('provider'),
             set::items($lang->host->providerList),
-            set::value($host->provider)
         ),
         formGroup
         (
@@ -215,7 +200,7 @@ formPanel
             set::name('status'),
             set::control('radioList'),
             set::label($lang->host->status),
-            set::value($host->status ? $host->status : 'online'),
+            set::value('online'),
             set::inline(true),
             set::items($lang->host->statusList),
         )
diff --git a/module/host/ui/edit.html.php b/module/host/ui/edit.html.php
index fe96fb5525..ae0f9cf7b0 100644
--- a/module/host/ui/edit.html.php
+++ b/module/host/ui/edit.html.php
@@ -180,7 +180,7 @@ formPanel
             set::control('picker'),
             set::name('vsoft'),
             set::items($lang->host->tagsList),
-            set::value($host->tags ? $host->tags : 'vm')
+            set::value($host->vsoft ? $host->vsoft : 'vm')
         )
     ),
     formRow
diff --git a/module/instance/model.php b/module/instance/model.php
index 4d05b6a972..33e34b1f1a 100644
--- a/module/instance/model.php
+++ b/module/instance/model.php
@@ -2045,6 +2045,7 @@ class InstanceModel extends model
      */
     public function isClickable(object $instance, string $action): bool
     {
+        if(!isset($instance->type)) $instance->type = 'store';
         if($action == 'start')     return $instance->type != 'external' ? $this->canDo('start', $instance) : false;
         if($action == 'stop')      return $instance->type != 'external' ? $this->canDo('stop', $instance) : false;
         if($action == 'uninstall') return $instance->type != 'external' && $this->canDo('uninstall', $instance);
diff --git a/module/mr/control.php b/module/mr/control.php
index 613dd16cb5..e0ff41b593 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -923,7 +923,7 @@ class mr extends control
             if($result['result'] == 'fail') return print(json_encode($result));
 
             $objectID = $result['id'];
-            $repo     = $this->repo->getRepoById($repoID);
+            $repo     = $this->repo->getByID($repoID);
             /* Handle the exception that when $repo is empty. */
             if(empty($repo) or empty($result)) $this->send(json_encode(array()));
 
diff --git a/module/pipeline/model.php b/module/pipeline/model.php
index 0f9b93f64a..a806f18a68 100644
--- a/module/pipeline/model.php
+++ b/module/pipeline/model.php
@@ -22,7 +22,7 @@ class pipelineModel extends model
     public function getByID($id)
     {
         $pipeline = $this->dao->select('*')->from(TABLE_PIPELINE)->where('id')->eq($id)->fetch();
-        if($pipeline)
+        if(!empty($pipeline->password))
         {
             $pipeline->password = base64_decode($pipeline->password);
         }
diff --git a/module/serverroom/ui/create.html.php b/module/serverroom/ui/create.html.php
index fd53120b86..f78783db6f 100644
--- a/module/serverroom/ui/create.html.php
+++ b/module/serverroom/ui/create.html.php
@@ -22,7 +22,6 @@ formPanel
         (
             set::name('name'),
             set::label($lang->serverroom->name),
-            set::value($serverroom->name),
         )
     ),
     formRow
@@ -31,7 +30,6 @@ formPanel
         (
             set::name('bandwidth'),
             set::label($lang->serverroom->bandwidth),
-            set::value($serverroom->bandwidth),
         )
     ),
     formRow
@@ -43,7 +41,6 @@ formPanel
             set::control('picker'),
             set::name('city'),
             set::items($lang->serverroom->cityList),
-            set::value($serverroom->city)
         )
     ),
     formRow
@@ -55,7 +52,6 @@ formPanel
             set::control('picker'),
             set::name('line'),
             set::items($lang->serverroom->lineList),
-            set::value($serverroom->line)
         )
     ),
     formRow
@@ -67,7 +63,6 @@ formPanel
             set::control('picker'),
             set::name('provider'),
             set::items($lang->serverroom->providerList),
-            set::value($serverroom->provider)
         )
     ),
     formRow
@@ -79,7 +74,6 @@ formPanel
             set::control('picker'),
             set::name('owner'),
             set::items($users),
-            set::value($serverroom->owner)
         )
     ),
 );
diff --git a/module/space/ui/browse.html.php b/module/space/ui/browse.html.php
index bec3a0d0af..2fd86ac3ea 100644
--- a/module/space/ui/browse.html.php
+++ b/module/space/ui/browse.html.php
@@ -19,7 +19,7 @@ $instances = initTableData($instances, $config->space->dtable->fieldList, $this-
 
 featureBar
 (
-    set::current($type),
+    set::current($browseType),
     set::linkParams("spaceID=&browseType={key}"),
 );
 
diff --git a/module/tree/lang/de.php b/module/tree/lang/de.php
index 5a8fb21f2f..ccf07b491e 100755
--- a/module/tree/lang/de.php
+++ b/module/tree/lang/de.php
@@ -37,8 +37,6 @@ $lang->tree->manageDashboard      = 'Manage Dashboard Module';
 $lang->tree->manageDashboardChild = 'Manage Dashboard Child Module';
 $lang->tree->manageProjectChild   = "Verwalte {$lang->projectCommon}";
 $lang->tree->manageTaskChild      = "Verwalte {$lang->execution->common}";
-$lang->tree->manageHostGroup      = 'Manage host group';
-$lang->tree->manageHostChild      = 'Manage child host';
 $lang->tree->syncFromProduct      = "Copy from Other {$lang->productCommon}s";
 $lang->tree->dragAndSort          = "Ziehen und Sotieren";
 $lang->tree->sort                 = "Sortieren";
@@ -57,6 +55,15 @@ $lang->tree->repeatName           = 'The name "%s" exists!';
 $lang->tree->repeatDirName        = 'The name "%s" exists!';
 $lang->tree->shouldNotBlank       = 'Module name should not be blank!';
 $lang->tree->syncProductModule    = 'Sync Module';
+$lang->tree->host                 = 'Host';
+$lang->tree->editHost             = 'Edit host group';
+$lang->tree->deleteHost           = 'Delete host group';
+$lang->tree->manageHostChild      = 'Manage child host';
+$lang->tree->groupMaintenance     = 'Manage host group';
+$lang->tree->groupName            = 'Group Name';
+$lang->tree->parentGroup          = 'Parent grpup';
+$lang->tree->childGroup           = 'Child';
+$lang->tree->confirmDeleteHost    = 'Do you want to delete this host and its child hosts?';
 
 $lang->tree->module       = 'Modul';
 $lang->tree->name         = 'Name';