From 3e515ea4dd1dfd31f51f94601008ccb8143c9452 Mon Sep 17 00:00:00 2001
From: Wenrui LI <liwenrui@easycorp.ltd>
Date: Mon, 21 Feb 2022 10:29:00 +0800
Subject: [PATCH] * make vision unswitchable for users without multiple
 visions.

---
 module/common/lang/en.php    |  1 +
 module/common/lang/zh-cn.php |  1 +
 module/common/model.php      | 17 +++++++++++------
 www/theme/default/style.css  |  3 ++-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 54514114c5..cca6821996 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -88,6 +88,7 @@ $lang->history         = 'History';
 $lang->attatch         = 'Files';
 $lang->reverse         = 'Inverse';
 $lang->switchDisplay   = 'Toggle';
+$lang->switchTo        = 'Switch To';
 $lang->expand          = 'Expand';
 $lang->collapse        = 'Collapse';
 $lang->saveSuccess     = 'Saved';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index cd5c41b05f..db0b35d8ca 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -88,6 +88,7 @@ $lang->history         = '历史记录';
 $lang->attatch         = '附件';
 $lang->reverse         = '切换顺序';
 $lang->switchDisplay   = '切换显示';
+$lang->switchTo        = '切换到';
 $lang->expand          = '展开全部';
 $lang->collapse        = '收起';
 $lang->saveSuccess     = '保存成功';
diff --git a/module/common/model.php b/module/common/model.php
index 0139212458..3b141fdbbb 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -405,8 +405,6 @@ class commonModel extends model
                 echo '</a></li><li class="divider"></li>';
 
                 $vision = $app->config->vision == 'lite' ? 'rnd' : 'lite';
-                if(strpos($app->user->visions, $vision) !== false) echo '<li>' . html::a(helper::createLink('my', 'ajaxSwitchVision', "vision=$vision"), "<i class='icon icon-exchange'></i> " . sprintf($lang->user->switchVision, $lang->visionList[$vision]), '', "data-type='ajax'") . '</li>';
-                echo '<li class="divider"></li>';
 
                 echo '<li>' . html::a(helper::createLink('my', 'profile', '', '', true), "<i class='icon icon-account'></i> " . $lang->profile, '', "class='iframe' data-width='600'") . '</li>';
 
@@ -479,17 +477,24 @@ class commonModel extends model
 
         if(isset($app->user))
         {
-            $vision  = $app->config->vision;
+            $currentVision = $app->config->vision;
+            $userVisions   = array_filter(explode(',', $app->user->visions));
+            if(count($userVisions) < 2)
+            {
+                echo "<div>{$lang->visionList[$currentVision]}</div>";
+                return;
+            }
 
             echo "<ul class='dropdown-menu pull-right'>";
-            foreach($lang->visionList as $visionKey => $visionName)
+            echo "<li class='text-gray'>{$lang->switchTo}:</li>";
+            foreach($userVisions as $vision)
             {
-                echo ($vision == $visionKey ? '<li class="active">' : '<li>') . html::a(helper::createLink('my', 'ajaxSwitchVision', "vision=$visionKey"), $visionName, '', "data-type='ajax'") . '</li>';
+                echo ($currentVision == $vision ? '<li class="active">' : '<li>') . html::a(helper::createLink('my', 'ajaxSwitchVision', "vision=$vision"), $lang->visionList[$vision], '', "data-type='ajax'") . '</li>';
             }
             echo '</ul>';
 
             echo "<a class='dropdown-toggle' data-toggle='dropdown'>";
-            echo "<div>{$lang->visionList[$vision]}</div>";
+            echo "<div>{$lang->visionList[$currentVision]}</div>";
             echo '</a>';
         }
     }
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 962496c08e..7243d751d9 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -50,7 +50,8 @@ a.showMoreImage:hover {opacity: 1;}
 .create-list>li>a>.icon {left: 5px !important;}
 
 #visionSwitcher .dropdown-menu {z-index: 2000;}
-#visionSwitcher .dropdown-toggle>div {font-size: 14px; padding: 5px; background: rgba(255,255,255, .3); border-radius: 5px;}
+#visionSwitcher .dropdown-toggle>div, #visionSwitcher>div {font-size: 14px; padding: 5px; background: rgba(255,255,255, .3); border-radius: 5px;}
+#visionSwitcher>div {margin: 10px 5px;}
 
 .c-icon {width: 20px;}
 .c-count {width: 30px;}