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

* Enable normal display of various app dashboards.

Browse Source
This commit is contained in:
wangyuting
2023-05-22 10:17:46 +08:00
parent 2b15553f0a
commit 9c96fa72c5
5 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update20.0.sql
+6 -4
View File
@@ -5,17 +5,19 @@ ALTER TABLE `zt_block` ADD `createdDate` date NULL AFTER `height`;
ALTER TABLE `zt_block` CHANGE `block` `code` varchar(30) NOT NULL DEFAULT '' AFTER `module`;
ALTER TABLE `zt_block` MODIFY `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `hidden`;
ALTER TABLE `zt_todo` CHANGE `idvalue` `objectID` mediumint(8) unsigned default '0' NOT NULL AFTER `type`;
ALTER TABLE `zt_todo` CHANGE `config` `config` VARCHAR(1000) NOT NULL DEFAULT '';
UPDATE `zt_block` SET `dashboard` = `module`;
UPDATE `zt_block` SET `dashboard` = CONCAT(`module`, `type`);
UPDATE `zt_block` SET `module` = IF(`source` != '', `source`, `code`);
DROP INDEX account_vision_module_type_order ON `zt_block`;
ALTER TABLE `zt_block` DROP COLUMN `source`;
ALTER TABLE `zt_block` DROP COLUMN `type`;
ALTER TABLE `zt_todo` CHANGE `idvalue` `objectID` mediumint(8) unsigned default '0' NOT NULL AFTER `type`;
ALTER TABLE `zt_todo` CHANGE `config` `config` VARCHAR(1000) NOT NULL DEFAULT '';
ALTER TABLE `zt_project` ADD `stageBy` enum('project', 'product') NOT NULL DEFAULT 'product' AFTER `division`;
UPDATE `zt_project` SET `stageBy` = 'project' WHERE `division` = '0';
UPDATE `zt_project` SET `stageBy` = 'product' WHERE `division` = '1';
ALTER TABLE `zt_project` DROP `division`;
module/block/model.php
+1 -1
View File
@@ -330,7 +330,7 @@ class blockModel extends model
/* Mark this app has init. */
$this->loadModel('setting')->setItem("$account.$dashboard.common.blockInited@$vision", '1');
$this->loadModel('setting')->setItem("$account.$dashboard.block.initVersion", $this->config->block->version);
$this->loadModel('setting')->setItem("$account.$dashboard.block.initVersion", (string)$this->config->block->version);
return true;
}
module/bug/model.php
+1 -1
View File
@@ -2836,7 +2836,7 @@ class bugModel extends model
* @access public
* @return string
*/
public function buildOperateMenu(object $bug = null, $type = 'view'): array
public function buildOperateMenu(object $bug = null, string $type = 'view'): array
{
$defaultParams = $bug ? "bugID={$bug->id}" : 'bugID={id}';
$copyParams = $bug ? "productID={$bug->product}&branch={$bug->branch}&extra=bugID={$bug->id}" : 'productID={product}&branch={branch}&extra=bugID={id}';
module/doc/control.php
+1 -1
View File
@@ -37,7 +37,7 @@ class doc extends control
public function index()
{
$this->view->title = $this->lang->doc->common . $this->lang->colon . $this->lang->doc->index;
$this->display();
echo $this->fetch('block', 'dashboard', 'dashboard=doc');
}
/**
module/project/control.php
+11 -7
View File
@@ -326,14 +326,18 @@ class project extends control
$this->view->usersAvatar = $this->loadModel('user')->getAvatarPairs('all');
$this->view->executionActions = $executionActions;
$this->view->pager = $pager;
$this->view->title = $this->lang->project->common . $this->lang->colon . $this->lang->project->index;
$this->view->position[] = $this->lang->project->index;
$this->view->project = $project;
$this->view->userIdPairs = $this->loadModel('user')->getPairs('nodeleted|showid|all');
$this->display();
}
else
{
echo $this->fetch('block', 'dashboard', "dashboard={$project->model}project");
}
$this->view->title = $this->lang->project->common . $this->lang->colon . $this->lang->project->index;
$this->view->position[] = $this->lang->project->index;
$this->view->project = $project;
$this->view->userIdPairs = $this->loadModel('user')->getPairs('nodeleted|showid|all');
$this->display();
}
/**