From 565ade2d5374e1b143649759aec9086e8d4d2e1d Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Fri, 21 Jan 2022 11:06:22 +0800 Subject: [PATCH] * adjust for dynamic. --- db/update16.3.sql | 1 + module/action/model.php | 2 ++ module/index/view/index.html.php | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/db/update16.3.sql b/db/update16.3.sql index 7cb56c695c..f76425fda6 100644 --- a/db/update16.3.sql +++ b/db/update16.3.sql @@ -7,3 +7,4 @@ ALTER TABLE `zt_lang` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `sys ALTER TABLE `zt_lang` DROP INDEX `lang`, ADD UNIQUE `lang` (`lang`,`module`,`section`,`key`,`vision`); ALTER TABLE `zt_doc` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`; ALTER TABLE `zt_doclib` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `type`; +ALTER TABLE `zt_action` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `read`; diff --git a/module/action/model.php b/module/action/model.php index 5aaabd6619..deeab96961 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -48,6 +48,7 @@ class actionModel extends model $action->action = $actionType; $action->date = helper::now(); $action->extra = $extra; + $action->vision = $this->config->vision; if($objectType == 'story' and strpos(',reviewpassed,reviewrejected,reviewclarified,', ",$actionType,") !== false) $action->actor = $this->lang->action->system; @@ -868,6 +869,7 @@ class actionModel extends model /* Get actions. */ $actions = $this->dao->select('*')->from(TABLE_ACTION) ->where('objectType')->notIN('kanbanregion,kanbanlane,kanbancolumn') + ->andWhere('vision')->eq($this->config->vision) ->beginIF($period != 'all')->andWhere('date')->gt($begin)->fi() ->beginIF($period != 'all')->andWhere('date')->lt($end)->fi() ->beginIF($date)->andWhere('date' . ($direction == 'next' ? '<' : '>') . "'{$date}'")->fi() diff --git a/module/index/view/index.html.php b/module/index/view/index.html.php index 80d7abc9ac..c237035c03 100644 --- a/module/index/view/index.html.php +++ b/module/index/view/index.html.php @@ -39,6 +39,10 @@ js::set('showFeatures', $showFeatures); #menuMoreList > li.active:before {content: ' '; display: block; position: absolute; left: 100%; border-width: 5px 5px 5px 0; border-style: solid; border-color: transparent; border-right-color: #ff9800; width: 0; height: 0; top: 12px} #menuMoreList > li.active:after {content: attr(data-tip); display: block; position: absolute; left: 100%; background-color: #f1a325; color: #fff; top: 3px; white-space: nowrap; line-height: 16px; padding: 8px 10px; margin-left: 5px; border-radius: 4px;} + +config->vision == 'lite'):?> +#searchbox .dropdown-menu.show-quick-go.with-active {min-height: 180px;} +