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

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

Browse Source
This commit is contained in:
Yagami
2018-11-28 13:05:10 +08:00
parent f65f6db2a4 c617950ac2
commit fb9e498ef6
8 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/productstatisticblock.html.php
+2 -2
View File
@@ -102,7 +102,7 @@ $(function()
<li class='switch-icon prev'><a><i class='icon icon-arrow-left'></i></a></li>
<?php foreach($products as $product):?>
<li <?php if($product == reset($products)) echo "class='active'";?> productID='<?php echo $product->id;?>'>
<a href="javascript:;" data-target="#tab<?php echo $product->code;?>" data-toggle="tab" title='<?php echo $product->name;?>'><?php echo $product->name;?></a>
<a href="javascript:;" data-target="#tabProduct<?php echo $product->id;?>" data-toggle="tab" title='<?php echo $product->name;?>'><?php echo $product->name;?></a>
<?php echo html::a(helper::createLink('product', 'browse', "productID=$product->id"), "<i class='icon-arrow-right text-primary'></i>", '', "class='btn-view' title={$lang->product->browse}");?></li>
<?php endforeach;?>
<li class='switch-icon next'><a><i class='icon icon-arrow-right'></i></a></li>
@@ -110,7 +110,7 @@ $(function()
</div>
<div class="col tab-content">
<?php foreach($products as $product):?>
<div class="tab-pane fade <?php if($product == reset($products)) echo 'active';?> in" id="tab<?php echo $product->code;?>">
<div class="tab-pane fade <?php if($product == reset($products)) echo 'active';?> in" id="tabProduct<?php echo $product->id;?>">
<div class="table-row">
<div class="col-6 text-middle">
<div class="tile">
module/block/view/qastatisticblock.html.php
+2 -2
View File
@@ -91,7 +91,7 @@ $(function()
<?php $index = 1;?>
<?php foreach($products as $product):?>
<li <?php if($product == reset($products)) echo "class='active'";?> productID='<?php echo $product->id;?>'>
<a href="javascript:;" data-target="#tab<?php echo $product->code;?>" data-toggle="tab" title='<?php echo $product->name;?>'><?php echo $product->name;?></a>
<a href="javascript:;" data-target="#tabQaProduct<?php echo $product->id;?>" data-toggle="tab" title='<?php echo $product->name;?>'><?php echo $product->name;?></a>
<?php echo html::a(helper::createLink('bug', 'browse', "productID=$product->id"), "<i class='icon-arrow-right text-primary'></i>", '', "class='btn-view' title={$lang->product->browse}");?></li>
<?php $index++;?>
<?php endforeach;?>
@@ -101,7 +101,7 @@ $(function()
<div class="col tab-content">
<?php $index = 1;?>
<?php foreach($products as $product):?>
<div class="tab-pane fade <?php if($index == 1) echo 'active';?> in" id="tabContent<?php echo $product->id;?>">
<div class="tab-pane fade <?php if($index == 1) echo 'active';?> in" id="tabQaProduct<?php echo $product->id;?>">
<div class="statistic-menu input-group space w-400px">
<div class="input-group-cell">
<?php if($product->testtask):?>
module/common/model.php
-2
View File
@@ -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'];
module/doc/css/view.css
-1
View File
@@ -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'}
module/git/model.php
+2 -3
View File
@@ -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);
module/mail/control.php
+1
View File
@@ -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();
module/upgrade/model.php
+2 -2
View File
@@ -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;
@@ -438,6 +437,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;
}
}
module/user/view/edit.html.php
+1 -1
View File
@@ -49,7 +49,7 @@
<table align='center' class='table table-form'>
<caption class='text-left text-muted'><?php echo $lang->user->accountInfo;?></caption>
<tr>
<th class='w-90px'><?php echo $lang->user->account;?></th>
<th class='w-100px'><?php echo $lang->user->account;?></th>
<td class='w-p40'><?php echo html::input('account', $user->account, "class='form-control' autocomplete='off'");?></td>
<th class='w-90px'><?php echo $lang->user->email;?></th>
<td>