Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [bug] modify sql, fix custom menu bug.

Browse Source
This commit is contained in:
sunguangming
2024-09-11 13:38:16 +08:00
committed by 王怡栋
parent 24c801c24a
commit 37c8e5b1d6
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update20.6.sql
+4 -1
View File
@@ -27,7 +27,10 @@ CREATE TABLE IF NOT EXISTS `zt_sqlbuilder` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
DELETE FROM `zt_workflowlayout` WHERE `field` IN (SELECT `field` FROM `zt_workflowfield` WHERe `buildin` = '1' AND `role` = 'buildin');
DELETE t1
FROM `zt_workflowlayout` t1
LEFT JOIN `zt_workflowfield` t2 ON t1.field = t2.field AND t1.module = t2.module
WHERE t2.buildin = '1' AND t2.role = 'buildin';
ALTER TABLE `zt_dataview` ADD `mode` enum('text', 'builder') not NULL default 'builder' AFTER `code`;
UPDATE `zt_dataview` SET `mode` = 'text';
lib/zin/wg/navbar/v1.php
+4 -1
View File
@@ -202,9 +202,12 @@ class navbar extends wg
$executionMoreItem = $this->getExecutionMoreItem($executionID);
if(!empty($executionMoreItem))
{
$items[] = array('type' => 'divider');
$items[] = $executionMoreItem;
}
elseif(isset(end($items)['type']) && end($items)['type'] == 'divider')
{
array_pop($items); // 最后一个是分割线，则删除
}
}
elseif($menuItem->link['module'] == 'app' and $menuItem->link['method'] == 'serverlink')
{
module/common/lang/menu.php
+1 -1
View File
@@ -439,7 +439,7 @@ $lang->execution->menu->settings['subMenu']->products = array('link' => "$lang-
$lang->execution->menu->settings['subMenu']->team = array('link' => "{$lang->team->common}|execution|team|executionID=%s", 'alias' => 'managemembers');
$lang->execution->menu->settings['subMenu']->whitelist = array('link' => "$lang->whitelist|execution|whitelist|executionID=%s", 'subModule' => 'personnel', 'alias' => 'addwhitelist');
$lang->execution->dividerMenu = ',story,build,';
$lang->execution->dividerMenu = ',story,build,more,';
$lang->project->noMultiple = new stdclass();
$lang->project->noMultiple->scrum = new stdclass();
module/project/tao.php
+1 -1
View File
@@ -1050,7 +1050,7 @@ class projectTao extends projectModel
$projectProduct = (int)$this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetch('product');
if(isset($lang->project->menu->settings['subMenu']->module['link'])) $lang->project->menu->settings['subMenu']->module['link'] = sprintf($lang->project->menu->settings['subMenu']->module['link'], $projectProduct);
if(!$hasProduct && in_array($model, $this->config->project->scrumList)) $lang->project->menu->projectplan['link'] = sprintf($lang->project->menu->projectplan['link'], $projectProduct);
if(!$hasProduct && in_array($model, $this->config->project->scrumList) && isset($lang->project->menu->projectplan)) $lang->project->menu->projectplan['link'] = sprintf($lang->project->menu->projectplan['link'], $projectProduct);
if(!$hasProduct) unset($lang->project->menu->settings['subMenu']->products);
if(!in_array($model, $this->config->project->scrumList)) unset($lang->project->menu->projectplan);