From 3d6e0158aff77c22544c32a990a098b61fa391f8 Mon Sep 17 00:00:00 2001
From: wangyidong <wyd621@163.com>
Date: Thu, 29 Apr 2021 17:16:39 +0800
Subject: [PATCH]  * adjust for demo sql.

---
 db/demo.sql                          | 24 ++++++++++++------------
 db/endemo.sql                        | 24 ++++++++++++------------
 module/block/view/dashboard.html.php | 17 +----------------
 3 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/db/demo.sql b/db/demo.sql
index b8fff184bb..d5fa696038 100644
--- a/db/demo.sql
+++ b/db/demo.sql
@@ -689,17 +689,17 @@ INSERT INTO `zt_testrun` (`id`, `task`, `case`, `version`, `assignedTo`, `lastRu
 (4, 1, 1, 1, '', 'testManager', '2012-06-05 11:11:00', 'pass', 'done');
 INSERT INTO `zt_testtask` (`id`, `project`, `name`, `product`, `execution`, `build`, `owner`, `pri`, `begin`, `end`, `mailto`, `desc`, `report`, `status`, `auto`, `subStatus`, `deleted`) VALUES
 (1, 0, '企业网站第一期测试任务', 1, 1, '1', 'testManager', 0, '2020-06-05', '2021-06-21', '', '', '', 'wait', 'no', '', '0');
-INSERT INTO `zt_user` (`id`, `company`, `dept`, `account`, `type`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `mobile`, `phone`, `weixin`, `dingding`, `slack`, `whatsapp`, `address`, `zipcode`, `nature`, `analysis`, `strategy`, `join`, `visits`, `ip`, `last`, `fails`, `locked`, `ranzhi`, `score`, `scoreLevel`, `deleted`, `clientStatus`, `clientLang`) VALUES
-(1, 0, 0, 'admin', 'inside', '31b69a7494a0eec4ac544fd648c9d604', '', 'admin', '', '', '', '0000-00-00', 'f', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 6, '10.0.2.2', 1619587357, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
-(2, 0, 5, 'productManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'po', '产品经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338866083, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
-(3, 0, 6, 'projectManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'pm', '项目经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 4, '10.0.2.2', 1619580798, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
-(4, 0, 2, 'dev1', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发甲', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '10.0.2.2', 1619586993, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
-(5, 0, 2, 'dev2', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发乙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '10.0.2.2', 1619587173, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
-(6, 0, 2, 'dev3', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发丙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '10.0.2.2', 1619587220, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
-(7, 0, 3, 'tester1', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试甲', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338865739, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
-(8, 0, 3, 'tester2', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试乙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '192.168.0.8', 1338865450, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
-(9, 0, 3, 'tester3', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试丙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '192.168.0.8', 1338865125, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
-(10, 0, 1, 'testManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qd', '测试经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 6, '192.168.0.8', 1338865842, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn');
+REPLACE INTO `zt_user` (`company`, `dept`, `account`, `type`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `mobile`, `phone`, `weixin`, `dingding`, `slack`, `whatsapp`, `address`, `zipcode`, `nature`, `analysis`, `strategy`, `join`, `visits`, `ip`, `last`, `fails`, `locked`, `ranzhi`, `score`, `scoreLevel`, `deleted`, `clientStatus`, `clientLang`) VALUES
+(0, 0, 'admin', 'inside', '31b69a7494a0eec4ac544fd648c9d604', '', 'admin', '', '', '', '0000-00-00', 'f', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 6, '10.0.2.2', 1619587357, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
+(0, 5, 'productManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'po', '产品经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338866083, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
+(0, 6, 'projectManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'pm', '项目经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 4, '10.0.2.2', 1619580798, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
+(0, 2, 'dev1', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发甲', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '10.0.2.2', 1619586993, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
+(0, 2, 'dev2', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发乙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '10.0.2.2', 1619587173, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
+(0, 2, 'dev3', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发丙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '10.0.2.2', 1619587220, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
+(0, 3, 'tester1', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试甲', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338865739, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
+(0, 3, 'tester2', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试乙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '192.168.0.8', 1338865450, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
+(0, 3, 'tester3', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试丙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '192.168.0.8', 1338865125, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
+(0, 1, 'testManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qd', '测试经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 6, '192.168.0.8', 1338865842, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn');
 INSERT INTO `zt_usergroup` (`account`, `group`, `project`) VALUES
 ('productManager', 5, ''),
 ('projectManager', 4, ''),
@@ -710,7 +710,7 @@ INSERT INTO `zt_usergroup` (`account`, `group`, `project`) VALUES
 ('tester2', 3, ''),
 ('tester1', 3, ''),
 ('testManager', 8, '');
-INSERT INTO `zt_userview` (`account`, `programs`, `projects`, `products`, `sprints`) VALUES
+REPLACE INTO `zt_userview` (`account`, `programs`, `projects`, `products`, `sprints`) VALUES
 ('admin', '', '', '', ''),
 ('dev1', '', '', '', ''),
 ('dev2', '', '', '', ''),
diff --git a/db/endemo.sql b/db/endemo.sql
index b8fff184bb..d5fa696038 100644
--- a/db/endemo.sql
+++ b/db/endemo.sql
@@ -689,17 +689,17 @@ INSERT INTO `zt_testrun` (`id`, `task`, `case`, `version`, `assignedTo`, `lastRu
 (4, 1, 1, 1, '', 'testManager', '2012-06-05 11:11:00', 'pass', 'done');
 INSERT INTO `zt_testtask` (`id`, `project`, `name`, `product`, `execution`, `build`, `owner`, `pri`, `begin`, `end`, `mailto`, `desc`, `report`, `status`, `auto`, `subStatus`, `deleted`) VALUES
 (1, 0, '企业网站第一期测试任务', 1, 1, '1', 'testManager', 0, '2020-06-05', '2021-06-21', '', '', '', 'wait', 'no', '', '0');
-INSERT INTO `zt_user` (`id`, `company`, `dept`, `account`, `type`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `mobile`, `phone`, `weixin`, `dingding`, `slack`, `whatsapp`, `address`, `zipcode`, `nature`, `analysis`, `strategy`, `join`, `visits`, `ip`, `last`, `fails`, `locked`, `ranzhi`, `score`, `scoreLevel`, `deleted`, `clientStatus`, `clientLang`) VALUES
-(1, 0, 0, 'admin', 'inside', '31b69a7494a0eec4ac544fd648c9d604', '', 'admin', '', '', '', '0000-00-00', 'f', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 6, '10.0.2.2', 1619587357, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
-(2, 0, 5, 'productManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'po', '产品经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338866083, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
-(3, 0, 6, 'projectManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'pm', '项目经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 4, '10.0.2.2', 1619580798, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
-(4, 0, 2, 'dev1', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发甲', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '10.0.2.2', 1619586993, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
-(5, 0, 2, 'dev2', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发乙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '10.0.2.2', 1619587173, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
-(6, 0, 2, 'dev3', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发丙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '10.0.2.2', 1619587220, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
-(7, 0, 3, 'tester1', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试甲', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338865739, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
-(8, 0, 3, 'tester2', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试乙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '192.168.0.8', 1338865450, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
-(9, 0, 3, 'tester3', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试丙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '192.168.0.8', 1338865125, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
-(10, 0, 1, 'testManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qd', '测试经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 6, '192.168.0.8', 1338865842, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn');
+REPLACE INTO `zt_user` (`company`, `dept`, `account`, `type`, `password`, `role`, `realname`, `nickname`, `commiter`, `avatar`, `birthday`, `gender`, `email`, `skype`, `qq`, `mobile`, `phone`, `weixin`, `dingding`, `slack`, `whatsapp`, `address`, `zipcode`, `nature`, `analysis`, `strategy`, `join`, `visits`, `ip`, `last`, `fails`, `locked`, `ranzhi`, `score`, `scoreLevel`, `deleted`, `clientStatus`, `clientLang`) VALUES
+(0, 0, 'admin', 'inside', '31b69a7494a0eec4ac544fd648c9d604', '', 'admin', '', '', '', '0000-00-00', 'f', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 6, '10.0.2.2', 1619587357, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
+(0, 5, 'productManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'po', '产品经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338866083, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
+(0, 6, 'projectManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'pm', '项目经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 4, '10.0.2.2', 1619580798, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
+(0, 2, 'dev1', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发甲', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '10.0.2.2', 1619586993, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
+(0, 2, 'dev2', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发乙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '10.0.2.2', 1619587173, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
+(0, 2, 'dev3', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'dev', '开发丙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '10.0.2.2', 1619587220, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
+(0, 3, 'tester1', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试甲', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 3, '192.168.0.8', 1338865739, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
+(0, 3, 'tester2', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试乙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 2, '192.168.0.8', 1338865450, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
+(0, 3, 'tester3', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qa', '测试丙', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 1, '192.168.0.8', 1338865125, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn'),
+(0, 1, 'testManager', 'inside', 'e10adc3949ba59abbe56e057f20f883e', 'qd', '测试经理', '', '', '', '0000-00-00', 'm', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0000-00-00', 6, '192.168.0.8', 1338865842, 0, '0000-00-00 00:00:00', '', 0, 0, '0', 'offline', 'zh-cn');
 INSERT INTO `zt_usergroup` (`account`, `group`, `project`) VALUES
 ('productManager', 5, ''),
 ('projectManager', 4, ''),
@@ -710,7 +710,7 @@ INSERT INTO `zt_usergroup` (`account`, `group`, `project`) VALUES
 ('tester2', 3, ''),
 ('tester1', 3, ''),
 ('testManager', 8, '');
-INSERT INTO `zt_userview` (`account`, `programs`, `projects`, `products`, `sprints`) VALUES
+REPLACE INTO `zt_userview` (`account`, `programs`, `projects`, `products`, `sprints`) VALUES
 ('admin', '', '', '', ''),
 ('dev1', '', '', '', ''),
 ('dev2', '', '', '', ''),
diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php
index 39fe632196..6a80927b69 100644
--- a/module/block/view/dashboard.html.php
+++ b/module/block/view/dashboard.html.php
@@ -22,7 +22,7 @@ $useGuest = $this->app->user->account == 'guest';
   <div class="table-empty-tip">
     <p>
       <span class="text-muted"><?php echo $lang->block->noData;?></span>
-      <?php echo html::a($this->createLink("block", "admin", "id=0&module=$module"), "<i class='icon icon-plus'></i> {$lang->block->createBlock}", '', "data-toggle='modal' data-type='ajax' data-width='700' data-title='{$lang->block->createBlock}' class='btn btn-info'")?> 
+      <?php echo html::a($this->createLink("block", "admin", "id=0&module=$module"), "<i class='icon icon-plus'></i> {$lang->block->createBlock}", '', "data-toggle='modal' data-type='ajax' data-width='700' data-title='{$lang->block->createBlock}' class='btn btn-info'")?>
       <?php echo html::a($this->createLink("block", "ajaxReset", "module=$module"), "<i class='icon icon-refresh'></i> {$lang->block->reset}", 'hiddenwin', 'class="btn btn-info"')?>
     </p>
   </div>
@@ -105,21 +105,6 @@ config.ordersSaved = '<?php echo $lang->block->ordersSaved; ?>';
 config.confirmRemoveBlock = '<?php echo $lang->block->confirmRemoveBlock; ?>';
 var module   = '<?php echo $module?>';
 var useGuest = <?php echo $useGuest ? 'true' : 'false';?>;
-<?php if(!$useGuest):?>
-<?php if(!isset($config->$module->block->initVersion) or $config->$module->block->initVersion < '2'):?>
-$(function()
-{
-    if(confirm('<?php echo $lang->block->noticeNewBlock;?>'))
-    {
-        $('#hiddenwin').attr('src', '<?php echo $this->createLink('block', 'ajaxUseNew', "module=$module&confirm=yes");?>');
-    }
-    else
-    {
-        $('#hiddenwin').attr('src', '<?php echo $this->createLink('block', 'ajaxUseNew', "module=$module&confirm=no");?>');
-    }
-})
-<?php endif;?>
-<?php endif;?>
 <?php $remind = $this->loadModel('misc')->getRemind();?>
 <?php if(!empty($remind)):?>
 var myModalTrigger = new $.zui.ModalTrigger({title:'<?php echo $lang->misc->remind;?>', custom: function(){return <?php echo json_encode($remind);?>}, width:'600px'});