Merge branch 'master' of https://github.com/easysoft/zentaopms

db/zentao.sql

@@ -397,21 +397,6 @@ CREATE TABLE IF NOT EXISTS `zt_history` (
   PRIMARY KEY (`id`),
   KEY `action` (`action`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- DROP TABLE IF EXISTS `zt_mailqueue`;
-CREATE TABLE IF NOT EXISTS `zt_mailqueue` (
-  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
-  `toList` varchar(255) NOT NULL,
-  `ccList` varchar(255) NOT NULL,
-  `subject` varchar(255) NOT NULL,
-  `body` text NOT NULL,
-  `addedBy` char(30) NOT NULL,
-  `addedDate` datetime NOT NULL,
-  `sendTime` datetime NOT NULL,
-  `status` varchar(10) NOT NULL DEFAULT 'wait',
-  `failReason` text NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `sendTime` (`sendTime`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_module`;
 CREATE TABLE IF NOT EXISTS `zt_module` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,

module/block/js/dashboard.js

@@ -62,7 +62,10 @@ function refreshBlock($panel, afterRefresh)
         var $data = $(data);
         if($data.hasClass('panel')) $panel.empty().append($data.children());
         else if($panel.find('#assigntomeBlock').length) $panel.find('#assigntomeBlock').empty().append($data.children());
-        else $panel.find('.panel-body').replaceWith($data);
+        else
+        {
+            $panel.find('.panel-body,.empty-tip').replaceWith($data);
+        }
         if($.isFunction(afterRefresh))
         {
             afterRefresh.call(this,

module/common/view/action.html.php

@@ -1,18 +1,16 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<style>
-.histories-list > li{word-break: break-all; word-wrap: break-word;}
-</style>
 <?php if(!empty($blockHistory)):?>
 <div class="panel block-histories histories" data-textDiff="<?php echo $lang->action->textDiff;?>" data-original="<?php echo $lang->action->original;?>">
 <?php else:?>
 <div class="detail histories" id='actionbox' data-textDiff="<?php echo $lang->action->textDiff;?>" data-original="<?php echo $lang->action->original;?>">
 <?php endif;?>
+<style>.histories-list > li{word-break: break-all; word-wrap: break-word;}</style>
   <script>
   $(function()
   {
       var diffButton = '<button type="button" class="btn btn-mini btn-icon btn-strip"><i class="icon icon-code icon-sm"></i></button>';
-      var newBoxID = ''
-      var oldBoxID = ''
+      var newBoxID = '';
+      var oldBoxID = '';
       $('blockquote.textdiff').each(function()
       {
           newBoxID = $(this).parent().attr('id');

module/common/view/datatable.html.php

@@ -78,6 +78,7 @@ $(document).ready(function()
             {
                 this.$datatable.find('.table').addClass('has-sort-head');
             }
+            this.$datatable.find('.sparkline').sparkline();
         }
     });
 

module/dev/config.php

@@ -71,6 +71,5 @@ $config->dev->tableMap['usertpl']        = 'user-tpl';
 $config->dev->tableMap['history']        = 'action-history';
 $config->dev->tableMap['lang']           = 'custom';
 $config->dev->tableMap['config']         = 'custom';
-$config->dev->tableMap['mailqueue']      = 'mail';
 $config->dev->tableMap['module']         = 'tree';
 $config->dev->tableMap['suitecase']      = 'testcase';

module/dev/lang/en.php

@@ -82,7 +82,6 @@ $lang->dev->tableList['testsuite']      = 'Test Suite';
 $lang->dev->tableList['tree']           = 'Module Tree';
 $lang->dev->tableList['upgrade']        = 'Update';
 $lang->dev->tableList['cron']           = 'Scheduled Task';
-$lang->dev->tableList['mailqueue']      = 'Mail Queue';
 $lang->dev->tableList['datatable']      = 'Data Table';
 $lang->dev->tableList['block']          = 'Block';
 $lang->dev->tableList['branch']         = 'Branch';
@@ -93,7 +92,6 @@ $lang->dev->tableList['suitecase']      = 'Suite Case';
 $lang->dev->tableList['score']          = 'Score';
 $lang->dev->tableList['entry']          = 'Entry';
 $lang->dev->tableList['webhook']        = 'WebHook';
-$lang->dev->tableList['webhookdatas']   = 'WebHookDatas';
 $lang->dev->tableList['log']            = 'Log';
 $lang->dev->tableList['message']        = 'Message';
 $lang->dev->tableList['notify']         = 'Notify';

module/dev/lang/zh-cn.php

@@ -82,7 +82,6 @@ $lang->dev->tableList['testsuite']      = '测试套件';
 $lang->dev->tableList['tree']           = '模块关系';
 $lang->dev->tableList['upgrade']        = '更新';
 $lang->dev->tableList['cron']           = '定时任务';
-$lang->dev->tableList['mailqueue']      = '邮件队列';
 $lang->dev->tableList['datatable']      = '数据表格';
 $lang->dev->tableList['block']          = '区块';
 $lang->dev->tableList['branch']         = '平台/分支';
@@ -93,7 +92,6 @@ $lang->dev->tableList['suitecase']      = '套件用例';
 $lang->dev->tableList['score']          = '积分';
 $lang->dev->tableList['entry']          = '应用';
 $lang->dev->tableList['webhook']        = 'WebHook';
-$lang->dev->tableList['webhookdatas']   = 'WebHook数据';
 $lang->dev->tableList['log']            = '接口日志';
 $lang->dev->tableList['message']        = '消息';
 $lang->dev->tableList['notify']         = '通知';

module/todo/view/view.html.php

@@ -37,7 +37,7 @@
         </div>
         <div class='detail-content'><?php echo $todo->desc;?></div>
       </div>
-      <div class='detail'><?php include '../../common/view/action.html.php';?></div>
+      <?php include '../../common/view/action.html.php';?>
     </div>
   </div>
   <div class='side-col col-4'>