From 78441e51f97505fceb928b9871d79ab6f7ff02ce Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 26 Nov 2018 10:46:25 +0800 Subject: [PATCH 1/3] * adjust for product statistic block. --- module/block/view/productstatisticblock.html.php | 4 ++-- module/block/view/qastatisticblock.html.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/block/view/productstatisticblock.html.php b/module/block/view/productstatisticblock.html.php index f1f735978b..8fe1db2093 100644 --- a/module/block/view/productstatisticblock.html.php +++ b/module/block/view/productstatisticblock.html.php @@ -102,7 +102,7 @@ $(function()
  • productID='id;?>'> - name;?> + name;?> id"), "", '', "class='btn-view' title={$lang->product->browse}");?>
    • @@ -110,7 +110,7 @@ $(function()
    -
    +
    diff --git a/module/block/view/qastatisticblock.html.php b/module/block/view/qastatisticblock.html.php index a0b10f6d71..04d824f93c 100644 --- a/module/block/view/qastatisticblock.html.php +++ b/module/block/view/qastatisticblock.html.php @@ -91,7 +91,7 @@ $(function()
  • productID='id;?>'> - name;?> + name;?> id"), "", '', "class='btn-view' title={$lang->product->browse}");?>
    • @@ -101,7 +101,7 @@ $(function()
    -
    +
    testtask):?> From f69fd87feb9bc9cd32ce20e86a4ea2d512641d44 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 27 Nov 2018 09:03:01 +0800 Subject: [PATCH 2/3] * fix bug. --- module/git/model.php | 5 ++--- module/mail/control.php | 1 + module/upgrade/model.php | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/module/git/model.php b/module/git/model.php index 2a8613ecad..496f425851 100644 --- a/module/git/model.php +++ b/module/git/model.php @@ -107,7 +107,7 @@ class gitModel extends model $this->printLog("parsing log {$log->revision}"); if($log->revision == $savedRevision) { - $this->printLog("{$log->revision} alread parsed, ommit it"); + $this->printLog("{$log->revision} alread parsed, commit it"); continue; } @@ -321,11 +321,10 @@ class gitModel extends model */ public function convertLog($log) { - list($hash, $account, $date) = $log; $account = preg_replace('/^Author:/', '', $account); - $account = trim(preg_replace('/<\w+@\w+\.\w+>/', '', $account)); + $account = trim(preg_replace('/<[\w\-\.]+@([\w\-]+\.)+\w+>/', '', $account)); $date = trim(preg_replace('/^Date:/', '', $date)); $count = count($log); diff --git a/module/mail/control.php b/module/mail/control.php index b30ea3f373..2d3350bd9d 100755 --- a/module/mail/control.php +++ b/module/mail/control.php @@ -303,6 +303,7 @@ class mail extends control public function asyncSend() { /* Reload mail config. */ + $this->loadModel('common')->loadConfigFromDB(); $this->app->loadConfig('mail'); $queueList = $this->mail->getQueue('wait', 'id_asc'); $now = helper::now(); diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 6a0c258806..9a6c4ca61f 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -438,6 +438,7 @@ class upgradeModel extends model { $errorInfo = $e->errorInfo; $errorCode = $errorInfo[1]; + $line = str_replace('zt_', $this->config->db->prefix, $line); if($errorCode == '1146') $tableExists = false; } } From c617950ac20cb38b2b7e341b2dba2d88f5cb02fd Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 28 Nov 2018 08:57:04 +0800 Subject: [PATCH 3/3] * adjust code. --- module/common/model.php | 2 -- module/doc/css/view.css | 1 - module/upgrade/model.php | 3 +-- module/user/view/edit.html.php | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index e3e5c50fa9..d5d87aa2e6 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1154,8 +1154,6 @@ EOD; { $preAndNextObject = new stdClass(); - if(strpos('story, task, bug, testcase, doc', $type) === false) return $preAndNextObject; - /* Use existObject when the preAndNextObject of this objectID has exist in session. */ $existObject = $type . 'PreAndNext'; if(isset($_SESSION[$existObject]) and $_SESSION[$existObject]['objectID'] == $objectID) return $_SESSION[$existObject]['preAndNextObject']; diff --git a/module/doc/css/view.css b/module/doc/css/view.css index c4ea111eca..b7e0dcbb93 100644 --- a/module/doc/css/view.css +++ b/module/doc/css/view.css @@ -17,5 +17,4 @@ .main-row > .main-col .article-content {transition: max-width; margin: 0 auto!important;} .main-row > .side-col > .cell {transition: opacity .2s;} .doc-fullscreen .main-row > .side-col {width: 0; position: relative; overflow: hidden} -.doc-fullscreen .main-row > .side-col > .cell {opacity: 0} .doc-fullscreen .fullscreen-btn > .icon-fullscreen:before {content: '\e972'} diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 9a6c4ca61f..80b7638b34 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -426,8 +426,7 @@ class upgradeModel extends model if(isset($out[1][0])) { $fields = array(); - $table = $out[1][0]; - $table = str_replace('zt_', $this->config->db->prefix, $out[1][0]); + $table = str_replace('zt_', $this->config->db->prefix, $out[1][0]); try { $tableExists = true; diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php index 4d9eb53882..00d8b852e9 100644 --- a/module/user/view/edit.html.php +++ b/module/user/view/edit.html.php @@ -49,7 +49,7 @@ - +
    user->accountInfo;?>
    user->account;?>user->account;?> account, "class='form-control' autocomplete='off'");?> user->email;?>