From 987d0d0443c62a79938860372016f44a0c8a5497 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Mon, 21 Mar 2022 17:00:42 +0800
Subject: [PATCH] * Fix bug #20968,20964.

---
 extension/lite/project/ext/config/lite.php |  2 ++
 module/admin/view/index.html.php           |  4 ++-
 module/project/model.php                   | 31 ++++++++++++++--------
 3 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 extension/lite/project/ext/config/lite.php

diff --git a/extension/lite/project/ext/config/lite.php b/extension/lite/project/ext/config/lite.php
new file mode 100644
index 0000000000..c2c824cc1b
--- /dev/null
+++ b/extension/lite/project/ext/config/lite.php
@@ -0,0 +1,2 @@
+<?php
+$config->project->datatable->fieldList['actions']['width'] = '120';
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index e42227294e..ba58d90336 100644
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -22,7 +22,9 @@
   <div class='main-header'>
     <h2>
       <?php
-      printf($lang->admin->info->version, $config->version);
+      $versionName = $config->version;
+      if($config->vision == 'lite') $versionName = $lang->liteName . $config->liteVersion;
+      printf($lang->admin->info->version, $versionName);
       if($bind) echo sprintf($lang->admin->info->account, '<span class="red">' . $account . '</span>');
       echo $lang->admin->info->links;
       ?>
diff --git a/module/project/model.php b/module/project/model.php
index 5098ad546c..9c5b843c93 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1721,20 +1721,29 @@ class projectModel extends model
                     $onlyBody = ($this->app->tab == 'program' or $project->model == 'kanban') ? true : '';
                     $dataApp  = $this->config->systemMode == 'classic' ? "data-app=execution" : "data-app=project";
                     $attr     = $project->model == 'kanban' ? " disabled='disabled'" : '';
-                    common::printIcon($moduleName, 'edit', "projectID=$project->id", $project, 'list', 'edit', '', $iframe, $onlyBody, $dataApp);
-                    common::printIcon($moduleName, 'manageMembers', "projectID=$project->id", $project, 'list', 'group', '', '', '', $dataApp . $attr, $this->lang->execution->team);
-                    if($this->config->systemMode == 'new') common::printIcon('project', 'group', "projectID=$project->id&programID=$programID", $project, 'list', 'lock', '', '', '', $dataApp . $attr);
 
-                    if(common::hasPriv($moduleName, 'manageProducts') || common::hasPriv($moduleName, 'whitelist') || common::hasPriv($moduleName, 'delete'))
+                    common::printIcon($moduleName, 'edit', "projectID=$project->id", $project, 'list', 'edit', '', $iframe, $onlyBody, $dataApp);
+
+                    if($this->config->vision != 'lite')
+                    {
+                        common::printIcon($moduleName, 'manageMembers', "projectID=$project->id", $project, 'list', 'group', '', '', '', $dataApp . $attr, $this->lang->execution->team);
+                        if($this->config->systemMode == 'new') common::printIcon('project', 'group', "projectID=$project->id&programID=$programID", $project, 'list', 'lock', '', '', '', $dataApp . $attr);
+
+                        if(common::hasPriv($moduleName, 'manageProducts') || common::hasPriv($moduleName, 'whitelist') || common::hasPriv($moduleName, 'delete'))
+                        {
+                            echo "<div class='btn-group'>";
+                            echo "<button type='button' class='btn dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'><i class='icon-more-alt'></i></button>";
+                            echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
+                            common::printIcon($moduleName, 'manageProducts', "projectID=$project->id", $project, 'list', 'link', '', 'btn-action', '', $dataApp . $attr, $this->lang->project->manageProducts);
+                            if($this->config->systemMode == 'new') common::printIcon('project', 'whitelist', "projectID=$project->id&module=project&from=$from", $project, 'list', 'shield-check', '', 'btn-action', '', $dataApp . $attr);
+                            if(common::hasPriv($moduleName, 'delete')) echo html::a(helper::createLink($moduleName, "delete", "projectID=$project->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn btn-action' title='{$this->lang->project->delete}'");
+                            echo "</ul>";
+                            echo "</div>";
+                        }
+                    }
+                    else
                     {
-                        echo "<div class='btn-group'>";
-                        echo "<button type='button' class='btn dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'><i class='icon-more-alt'></i></button>";
-                        echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
-                        common::printIcon($moduleName, 'manageProducts', "projectID=$project->id", $project, 'list', 'link', '', 'btn-action', '', $dataApp . $attr, $this->lang->project->manageProducts);
-                        if($this->config->systemMode == 'new') common::printIcon('project', 'whitelist', "projectID=$project->id&module=project&from=$from", $project, 'list', 'shield-check', '', 'btn-action', '', $dataApp . $attr);
                         if(common::hasPriv($moduleName, 'delete')) echo html::a(helper::createLink($moduleName, "delete", "projectID=$project->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn btn-action' title='{$this->lang->project->delete}'");
-                        echo "</ul>";
-                        echo "</div>";
                     }
                     break;
             }