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

Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8

Browse Source
This commit is contained in:
wangyidong
2018-03-15 11:21:49 +08:00
parent fb8b43ea4b aad4e06ca6
commit 9d0261a578
10 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/CHANGELOG
+1 -1
View File
@@ -1,4 +1,4 @@
2017-01-17 9.8.stable
2018-01-17 9.8.stable
完成的需求
683 todo增加转需求，bug或者任务的功能
1678 todo增加评论功能。
module/build/css/view.css
+7
View File
@@ -1,3 +1,10 @@
#stories .action{display:none;}
#bugs .action{display:none;}
tbody tr td:first-child input{display:none;}
tfoot tr td .table-actions .btn{display:none;}
#titlebar .actions{display:none}
.row-table .col-side{display:none;}
.tabs {position:relative;}
.tabs .nav-tabs{border-bottom:none;}
module/build/view/view.html.php
-9
View File
@@ -15,15 +15,6 @@
<?php js::set('confirmUnlinkBug', $lang->build->confirmUnlinkBug)?>
<?php js::set('flow', $this->config->global->flow)?>
<?php if(isonlybody()):?>
<style>
#stories .action{display:none;}
#bugs .action{display:none;}
tbody tr td:last-child a{display:none;}
tbody tr td:first-child input{display:none;}
tfoot tr td .table-actions .btn{display:none;}
#titlebar .actions{display:none}
.row-table .col-side{display:none;}
</style>
<?php endif;?>
<div id='titlebar'>
<div class='heading'>
module/misc/lang/en.php
+14
View File
@@ -74,6 +74,20 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = 'Latest Version';
$lang->misc->feature->detailed = 'Details';
$lang->misc->releaseDate['9.8.stable'] = '2017-01-17';
$lang->misc->releaseDate['9.7.stable'] = '2017-12-22';
$lang->misc->releaseDate['9.6.stable'] = '2017-11-06';
$lang->misc->releaseDate['9.5.1'] = '2017-09-27';
$lang->misc->releaseDate['9.3.beta'] = '2017-06-21';
$lang->misc->releaseDate['9.1.stable'] = '2017-03-23';
$lang->misc->releaseDate['9.0.beta'] = '2017-01-03';
$lang->misc->releaseDate['8.3.stable'] = '2016-11-09';
$lang->misc->releaseDate['8.2.stable'] = '2016-05-17';
$lang->misc->releaseDate['7.4.beta'] = '2015-11-13';
$lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Message centralized management', 'desc' => '<p>Centring Mail，SMS，webhook into Message</p>');
$lang->misc->feature->all['9.8.stable'][] = array('title'=>'Add Periodic Todo function', 'desc' => '');
$lang->misc->feature->all['9.8.stable'][] = array('title'=>"Add Block of 'Assigned to Me'", 'desc' => '');
module/misc/lang/zh-cn.php
+14
View File
@@ -74,6 +74,20 @@ $lang->misc->feature = new stdclass();
$lang->misc->feature->lastest = '最新版本';
$lang->misc->feature->detailed = '详情';
$lang->misc->releaseDate['9.8.stable'] = '2017-01-17';
$lang->misc->releaseDate['9.7.stable'] = '2017-12-22';
$lang->misc->releaseDate['9.6.stable'] = '2017-11-06';
$lang->misc->releaseDate['9.5.1'] = '2017-09-27';
$lang->misc->releaseDate['9.3.beta'] = '2017-06-21';
$lang->misc->releaseDate['9.1.stable'] = '2017-03-23';
$lang->misc->releaseDate['9.0.beta'] = '2017-01-03';
$lang->misc->releaseDate['8.3.stable'] = '2016-11-09';
$lang->misc->releaseDate['8.2.stable'] = '2016-05-17';
$lang->misc->releaseDate['7.4.beta'] = '2015-11-13';
$lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
$lang->misc->feature->all['9.8.stable'][] = array('title'=>'实现集中的消息处理机制', 'desc' => '<p>邮件，短信，webhook都放统一的消息发送</p><p>移植然之里面的消息通知功能</p>');
$lang->misc->feature->all['9.8.stable'][] = array('title'=>'实现周期性待办功能', 'desc' => '');
$lang->misc->feature->all['9.8.stable'][] = array('title'=>'增加指派给我的区块', 'desc' => '');
module/misc/view/changelog.html.php
+2 -2
View File
@@ -6,11 +6,11 @@
</div>
</div>
<div class='dropdown' id='versionMenu'>
<button class='btn btn-sm dropdown-toggle' type='button' data-toggle='dropdown'><?php echo $version === 'latest' ? $lang->misc->feature->lastest : ('v' . $version) ?> <span class='caret'></span></button>
<button class='btn btn-sm dropdown-toggle' type='button' data-toggle='dropdown'><?php echo $version === 'latest' ? $lang->misc->feature->lastest : ($lang->misc->releaseDate[$version] . ' ' . $version);?> <span class='caret'></span></button>
<ul class='dropdown-menu'>
<?php foreach(array_keys($lang->misc->feature->all) as $versionName):?>
<li<?php echo $versionName === $version ? " class='active'" : '' ?>>
<?php echo html::a(helper::createLink('misc', 'changeLog', "version=$versionName"), $versionName === 'latest' ? $lang->misc->feature->lastest : ('v' . $versionName));?>
<?php echo html::a(helper::createLink('misc', 'changeLog', "version=$versionName"), $versionName === 'latest' ? $lang->misc->feature->lastest : ($lang->misc->releaseDate[$versionName] . ' ' . $versionName));?>
</li>
<?php endforeach; ?>
</ul>
module/product/view/all.html.php
+1 -1
View File
@@ -89,7 +89,7 @@
<?php echo html::a($this->createLink('product', 'view', 'product=' . $product->id), sprintf('%03d', $product->id));?>
</td>
<td class='text-left' title='<?php echo $product->name?>'><?php echo html::a($this->createLink('product', 'view', 'product=' . $product->id), $product->name);?></td>
<td class='text-left'><?php echo zget($lines, $product->line);?></td>
<td class='text-left'><?php echo zget($lines, $product->line, '');?></td>
<td><?php echo $product->stories['active']?></td>
<td><?php echo $product->stories['changed']?></td>
<td><?php echo $product->stories['draft']?></td>
module/productplan/view/browse.html.php
+4 -4
View File
@@ -48,13 +48,13 @@
<?php if($this->session->currentProductType != 'normal'):?>
<th class='w-100px'><?php common::printOrderLink('branch',$orderBy, $vars, $lang->product->branch);?></th>
<?php endif;?>
<th class='w-100px'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->productplan->begin);?></th>
<th class='w-100px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->productplan->end);?></th>
<th class='w-60px'> <?php echo $lang->productplan->stories;?></th>
<th class='w-60px'> <?php echo $lang->productplan->bugs;?></th>
<th class='w-60px'> <?php echo $lang->productplan->hour;?></th>
<th class='w-60px'> <?php echo $lang->productplan->project;?></th>
<th class='w-p40'> <?php echo $lang->productplan->desc;?></th>
<th class='w-100px'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->productplan->begin);?></th>
<th class='w-100px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->productplan->end);?></th>
<th class="w-130px {sorter: false}"><?php echo $lang->actions;?></th>
</tr>
</thead>
@@ -71,13 +71,13 @@
<?php if($this->session->currentProductType != 'normal'):?>
<td><?php echo $branches[$plan->branch];?></td>
<?php endif;?>
<td><?php echo $plan->begin;?></td>
<td><?php echo $plan->end == '2030-01-01' ? $lang->productplan->future : $plan->end;?></td>
<td class='text-center'><?php echo $plan->stories;?></td>
<td class='text-center'><?php echo $plan->bugs;?></td>
<td class='text-center'><?php echo $plan->hour;?></td>
<td class='text-center'><?php if(!empty($plan->projectID)) echo html::a(helper::createLink('project', 'task', 'projectID=' . $plan->projectID), '<i class="icon-search"></i>');?></td>
<td class='text-left content'><div class='article-content'><?php echo $plan->desc;?></div></td>
<td><?php echo $plan->begin;?></td>
<td><?php echo $plan->end == '2030-01-01' ? $lang->productplan->future : $plan->end;?></td>
<td class='text-center'>
<?php
if(common::hasPriv('project', 'create')) echo html::a(helper::createLink('project', 'create', "projectID=&copyProjectID=&planID=$plan->id"), '<i class="icon-play"></i>', '', "class='btn-icon' title='{$lang->project->create}'");
module/task/view/finish.html.php
+1 -1
View File
@@ -38,7 +38,7 @@
</tr>
<tr>
<th><?php echo empty($task->team) ? $lang->task->assign : $lang->task->transferTo;?></th>
<td><?php echo html::select('assignedTo', $members, $task->nextBy, "class='form-control chosen'");?></td><td></td>
<td><?php echo html::select('assignedTo', $members, $task->openedBy, "class='form-control chosen'");?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->task->finishedDate;?></th>
module/user/model.php
+1
View File
@@ -383,6 +383,7 @@ class userModel extends model
->batchCheck($this->config->user->edit->requiredFields, 'notempty')
->check('account', 'unique', "id != '$userID'")
->check('account', 'account')
->checkIF($this->post->email != '', 'email', 'email')
->where('id')->eq((int)$userID)
->exec();