Merge branch 'master' of github.com:easysoft/zentaopms
This commit is contained in:
@@ -785,9 +785,10 @@ class bug extends control
|
||||
{
|
||||
if(!empty($_POST))
|
||||
{
|
||||
$this->bug->confirm($bugID);
|
||||
$changes = $this->bug->confirm($bugID);
|
||||
if(dao::isError()) die(js::error(dao::getError()));
|
||||
$actionID = $this->action->create('bug', $bugID, 'bugConfirmed', $this->post->comment);
|
||||
$this->action->logHistory($actionID, $changes);
|
||||
$this->bug->sendmail($bugID, $actionID);
|
||||
if(isonlybody()) die(js::closeModal('parent.parent'));
|
||||
die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent'));
|
||||
|
||||
@@ -640,7 +640,8 @@ class bugModel extends model
|
||||
*/
|
||||
public function confirm($bugID)
|
||||
{
|
||||
$now = helper::now();
|
||||
$now = helper::now();
|
||||
$oldBug = $this->getById($bugID);
|
||||
|
||||
$bug = fixer::input('post')
|
||||
->setDefault('confirmed', 1)
|
||||
@@ -651,6 +652,8 @@ class bugModel extends model
|
||||
->get();
|
||||
|
||||
$this->dao->update(TABLE_BUG)->data($bug)->where('id')->eq($bugID)->exec();
|
||||
|
||||
if(!dao::isError()) return common::createChanges($oldBug, $bug);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -86,7 +86,7 @@ foreach(explode(',', $showFields) as $field)
|
||||
<td style='overflow:visible'>
|
||||
<div class='input-group'>
|
||||
<?php echo html::hidden("color[$i]", '', "data-provide='colorpicker' data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->bug->colorTag}' data-update-text='#title\\[{$i}\\]'");?>
|
||||
<?php echo html::input("title[$i]", $bugTitle, 'class=form-control') . html::hidden("uploadImage[$i]", $fileName);?>
|
||||
<?php echo html::input("title[$i]", $bugTitle, "class='form-control' autocomplete='off'") . html::hidden("uploadImage[$i]", $fileName);?>
|
||||
</div>
|
||||
</td>
|
||||
<td class='<?php echo zget($visibleFields, 'steps', 'hidden')?>'> <?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?></td>
|
||||
@@ -95,7 +95,7 @@ foreach(explode(',', $showFields) as $field)
|
||||
<td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>'><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
|
||||
<td class='<?php echo zget($visibleFields, 'os', 'hidden')?>'> <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control'");?></td>
|
||||
<td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control'");?></td>
|
||||
<td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', 'class=form-control');?></td>
|
||||
<td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', "class='form-control' autocomplete='off'");?></td>
|
||||
</tr>
|
||||
<?php $i++;?>
|
||||
<?php endforeach;?>
|
||||
@@ -119,7 +119,7 @@ foreach(explode(',', $showFields) as $field)
|
||||
<td style='overflow:visible'>
|
||||
<div class='input-group'>
|
||||
<?php echo html::hidden("color[$i]", '', "data-provide='colorpicker' data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->bug->colorTag}' data-update-text='#title\\[{$i}\\]'");?>
|
||||
<?php echo html::input("title[$i]", '', 'class=form-control');?>
|
||||
<?php echo html::input("title[$i]", '', "class='form-control' autocomplete='off'");?>
|
||||
</div>
|
||||
</td>
|
||||
<td class='<?php echo zget($visibleFields, 'steps', 'hidden')?>'> <?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?></td>
|
||||
@@ -128,7 +128,7 @@ foreach(explode(',', $showFields) as $field)
|
||||
<td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>'><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
|
||||
<td class='<?php echo zget($visibleFields, 'os', 'hidden')?>'> <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control'");?></td>
|
||||
<td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control'");?></td>
|
||||
<td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', 'class=form-control');?></td>
|
||||
<td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', "class='form-control' autocomplete='off'");?></td>
|
||||
</tr>
|
||||
<?php endfor;?>
|
||||
</tbody>
|
||||
@@ -148,7 +148,7 @@ foreach(explode(',', $showFields) as $field)
|
||||
<td style='overflow:visible'>
|
||||
<div class='input-group'>
|
||||
<?php echo html::hidden("color[%s]", '', "data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->bug->colorTag}' data-update-text='#title\\[%s\\]'");?>
|
||||
<?php echo html::input("title[%s]", '', 'class=form-control');?>
|
||||
<?php echo html::input("title[%s]", '', "class='form-control' autocomplete='off'");?>
|
||||
</div>
|
||||
</td>
|
||||
<td class='<?php echo zget($visibleFields, 'steps', 'hidden')?>'> <?php echo html::textarea("stepses[%s]", '', "rows='1' class='form-control autosize'");?></td>
|
||||
@@ -157,7 +157,7 @@ foreach(explode(',', $showFields) as $field)
|
||||
<td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>'><?php echo html::select("severities[%s]", $lang->bug->severityList, '', "class='form-control'");?></td>
|
||||
<td class='<?php echo zget($visibleFields, 'os', 'hidden')?>'> <?php echo html::select("oses[%s]", $lang->bug->osList, '', "class='form-control'");?></td>
|
||||
<td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>'> <?php echo html::select("browsers[%s]", $lang->bug->browserList, '', "class='form-control'");?></td>
|
||||
<td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[%s]", '', 'class=form-control');?></td>
|
||||
<td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[%s]", '', "class='form-control' autocomplete='off'");?></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
@@ -6,7 +6,7 @@ $lang->mail->edit = 'Edit Settings';
|
||||
$lang->mail->save = 'Saved';
|
||||
$lang->mail->test = 'Email Testing';
|
||||
$lang->mail->reset = 'Reset';
|
||||
$lang->mail->resend = '重发失败邮件';
|
||||
$lang->mail->resend = 'Send it again.';
|
||||
$lang->mail->browse = 'Email List';
|
||||
$lang->mail->delete = 'Delete Email';
|
||||
$lang->mail->ztCloud = 'ZenTao CloudMail';
|
||||
@@ -70,7 +70,7 @@ $lang->mail->secureList['ssl'] = 'ssl';
|
||||
$lang->mail->secureList['tls'] = 'tls';
|
||||
|
||||
$lang->mail->more = 'More';
|
||||
$lang->mail->noticeResend = '已经重新发信!';
|
||||
$lang->mail->noticeResend = 'Sent it again!';
|
||||
$lang->mail->inputFromEmail = 'Enter Email Address';
|
||||
$lang->mail->nextStep = 'Next';
|
||||
$lang->mail->successSaved = 'Configuration has been saved.';
|
||||
|
||||
+18
-18
@@ -35,7 +35,7 @@ $lang->misc->zentao->support['vip'] = "VIP Technical Support";
|
||||
$lang->misc->zentao->support['manual'] = "User Manual";
|
||||
$lang->misc->zentao->support['faq'] = "FAQ";
|
||||
$lang->misc->zentao->support['ask'] = "Q&A";
|
||||
$lang->misc->zentao->support['qqgroup'] = "官方QQ群";
|
||||
$lang->misc->zentao->support['qqgroup'] = "Official QQ Group";
|
||||
|
||||
$lang->misc->zentao->cowin['donate'] = "Donate";
|
||||
$lang->misc->zentao->cowin['reportbug'] = "Report Bug ";
|
||||
@@ -63,30 +63,30 @@ $lang->misc->novice = "First time to ZenTao? Do you want to start rookie mo
|
||||
|
||||
$lang->misc->feature = new stdclass();
|
||||
$lang->misc->feature->lastest = 'Latest Version';
|
||||
$lang->misc->feature->detailed = '详情';
|
||||
$lang->misc->feature->detailed = 'Details';
|
||||
|
||||
$lang->misc->feature->all['9.0.beta'][] = array('title'=>'增加禅道云发信功能', 'desc' => '<p>禅道云发信是禅道联合SendCloud推出的一项免费发信服务,只有用户绑定禅道,并通过验证即可使用。</p>');
|
||||
$lang->misc->feature->all['9.0.beta'][] = array('title'=>'优化富文本编辑器和markdown编辑器', 'desc' => '');
|
||||
$lang->misc->feature->all['9.0.beta'][] = array('title'=>'ZenTao CloudMail has been added.', 'desc' => '<p>ZenTao CloudMail is a free Email service launched jointly with SendCloud. Once binded with ZenTao and passed verification, users can use this service.</p>');
|
||||
$lang->misc->feature->all['9.0.beta'][] = array('title'=>'Optimized Rich Text Editor and Markdown Editor.', 'desc' => '');
|
||||
|
||||
$lang->misc->feature->all['8.3.stable'][] = array('title'=>'调整文档功能', 'desc' => '<p>增加文档模块首页,重新组织文档库结构,增加权限</p><p>多种文件浏览方式,文档支持Markdown,增加文档权限管理,增加文件版本管理。</p>');
|
||||
$lang->misc->feature->all['8.3.stable'][] = array('title'=>'Improved Documentation.', 'desc' => '<p>Added Document Home, restructured document library, and added privileges.</p><p>Markdown Editor is supported,and privilege and version managment is added.</p>');
|
||||
|
||||
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Home', 'desc' => '<p>You can add blocks to Dashboard and arrange the layout.</p><p> My Zone, Product, Project, and Testing all support home custom mentioned before. </p>');
|
||||
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Navigation', 'desc' => '<p>You can decide which project show in navigation bar and the order of projects shown in the bar.</p><p> Hover on the navigation bar and a sign will show to its right. Click the sign and a dialog box "Custom Navigation" will show. Drag the block name to switch its order on navigation bar.</p>');
|
||||
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Batch Add/Edit Custom', 'desc' => '<p>You can batch add and edit fields on custom pages.</p>');
|
||||
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Add Custom Story/Task/Bug/Case', 'desc' => '<p>You can custom fileds when add a Story/Task/Bug/Case.</p>');
|
||||
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Export', 'desc' => '<p>You can custom fileds when export a Story/Task/Bug/Case pages. You can save it as template for next export.</p>');
|
||||
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Story/Task/Bug/Case Combinatorial Search ', 'desc' => '<p>On Story/Task/Bug/Case List page, you can do combinatorial search on Modules and Tabs.</p>');
|
||||
$lang->misc->feature->all['8.2.stable'][] = array('title'=>"Rookie's Tutorial", 'desc' => '<p>Tutorial for Rookies is added for users to know how to use ZenTao.</p>');
|
||||
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Story/Task/Bug/Case', 'desc' => '<p>You can custom fileds when add a Story/Task/Bug/Case.</p>');
|
||||
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Custom Export', 'desc' => '<p>You can custom fileds when export a Story/Task/Bug/Case pages. You can also save it as template for next export.</p>');
|
||||
$lang->misc->feature->all['8.2.stable'][] = array('title'=>'Story/Task/Bug/Case Search ', 'desc' => '<p>On Story/Task/Bug/Case List page, you can do a combined search on Modules and Tabs.</p>');
|
||||
$lang->misc->feature->all['8.2.stable'][] = array('title'=>"Rookie's Tutorial", 'desc' => '<p>Tutorial for Rookies is added for first-time users to know how to use ZenTao.</p>');
|
||||
|
||||
$lang->misc->feature->all['7.4.beta'][] = array('title'=>'产品实现分支功能', 'desc' => '<p>产品增加分支/平台类型,相应的需求、计划、Bug、用例、模块等都增加分支。</p>');
|
||||
$lang->misc->feature->all['7.4.beta'][] = array('title'=>'调整发布模块', 'desc' => '<p>发布增加停止维护操作,当发布停止维护时,创建Bug将不显示这个发布。</p><p>发布中遗留的bug改为手工关联。</p>');
|
||||
$lang->misc->feature->all['7.4.beta'][] = array('title'=>'调整需求和Bug的创建页面', 'desc' => '');
|
||||
$lang->misc->feature->all['7.4.beta'][] = array('title'=>'Product branch feature is added.', 'desc' => '<p>Product branch/platform is added, and its related Story/Plan/Bug/Case/Module has Branch added too.</p>');
|
||||
$lang->misc->feature->all['7.4.beta'][] = array('title'=>'Release Module is improved.', 'desc' => '<p>Stop action has been added. If Stop to manage it, the Release will not show when Report Bug.</p><p>Bugs that have been omitted in the Release will be related manually.</p>');
|
||||
$lang->misc->feature->all['7.4.beta'][] = array('title'=>'Create pages of Story and Bug are improved.', 'desc' => '');
|
||||
|
||||
$lang->misc->feature->all['7.2.stable'][] = array('title'=>'增强安全', 'desc' => '<p>加强对管理员弱口令的检查。</p><p>写插件,上传插件的时候需要创建ok文件。</p><p>敏感操作增加管理员口令的检查</p><p>对输入内容做striptags, specialchars处理。</p>');
|
||||
$lang->misc->feature->all['7.2.stable'][] = array('title'=>'完善细节', 'desc' => '');
|
||||
$lang->misc->feature->all['7.2.stable'][] = array('title'=>'Security Enhanced', 'desc' => '<p>Admin weak passwork check is enhanced.</p><p>ok file is required when code/upload an extension.</p><p>Sensitive action requires Admin password.</p><p>Do striptags, specialchars to content entered in ZenTao.</p>');
|
||||
$lang->misc->feature->all['7.2.stable'][] = array('title'=>'Details Improved', 'desc' => '');
|
||||
|
||||
$lang->misc->feature->all['7.1.stable'][] = array('title'=>'提供计划任务框架', 'desc' => '增加计划任务框架,加入每日提醒、更新燃尽图、备份、发信等重要任务。');
|
||||
$lang->misc->feature->all['7.1.stable'][] = array('title'=>'提供rpm和deb包', 'desc' => '');
|
||||
$lang->misc->feature->all['7.1.stable'][] = array('title'=>'Framework of scheduled tasks is added.', 'desc' => 'Framework of scheduled tasks is added. Daily notification, Burndown Update, Backup, Send Email and so on have been added.');
|
||||
$lang->misc->feature->all['7.1.stable'][] = array('title'=>'rpm and deb packages are provided.', 'desc' => '');
|
||||
|
||||
$lang->misc->feature->all['6.3.stable'][] = array('title'=>'增加数据表格功能', 'desc' => '<p>可配置数据表格中可显示的字段,按照配置字段显示想看的数据</p>');
|
||||
$lang->misc->feature->all['6.3.stable'][] = array('title'=>'继续完善细节', 'desc' => '');
|
||||
$lang->misc->feature->all['6.3.stable'][] = array('title'=>'Data table is added.', 'desc' => '<p>Fields can be customized in data table and data will be displayed according to customized fields.</p>');
|
||||
$lang->misc->feature->all['6.3.stable'][] = array('title'=>'Continue improving details', 'desc' => '');
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
<?php
|
||||
$class = "class='disabled'";
|
||||
$actionLink = $this->createLink('story', 'batchClose');
|
||||
$misc = ($canBatchClose and $type != 'closedBy') ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : $class;
|
||||
$misc = ($canBatchClose and $type != 'closedBy') ? "onclick=\"setFormAction('$actionLink')\"" : $class;
|
||||
if($misc) echo "<li>" . html::a('javascript:;', $lang->close, '', $misc) . "</li>";
|
||||
|
||||
if(common::hasPriv('story', 'batchReview'))
|
||||
|
||||
@@ -99,4 +99,5 @@ table th.col-closed {width:15%}
|
||||
#kanbanHeader.affix .actions .btn {background: #114f8e; color: #f1f1f1;}
|
||||
#kanbanHeader.affix th {border-color: rgba(255,255,255,.2)}
|
||||
|
||||
.label-delay {background-color: #e84e0f; margin-bottom: 2px;}
|
||||
.label-delay-doing {background-color: #000; margin-bottom: 2px;}
|
||||
.label-delay-wait {background-color: #d2322d; margin-bottom: 2px;}
|
||||
|
||||
@@ -95,8 +95,14 @@
|
||||
<?php foreach($story->tasks[$col] as $task):?>
|
||||
<div class='board board-task board-task-<?php echo $col ?><?php if($task->assignedTo == $this->app->user->account) echo ' inverse';?>' data-id='<?php echo $task->id?>' id='task-<?php echo $task->id?>'>
|
||||
<div class='board-title'>
|
||||
<?php if(isset($task->delay)) echo "<span class='label label-badge label-delay'>{$lang->project->delayed}</span>";?>
|
||||
<?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', true), $task->name, '', 'class="kanbanFrame" title="' . $task->name . '"');?>
|
||||
<?php
|
||||
if(isset($task->delay))
|
||||
{
|
||||
$labelClass = $task->status == 'doing' ? 'label-delay-doing' : 'label-delay-wait';
|
||||
echo "<span class='label label-badge {$labelClass}'>{$lang->task->delayed}</span>";
|
||||
}
|
||||
echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', true), $task->name, '', 'class="kanbanFrame" title="' . $task->name . '"');
|
||||
?>
|
||||
<div class='board-actions'>
|
||||
<button type='button' class='btn btn-mini btn-link btn-info-toggle'><i class='icon-angle-down'></i></button>
|
||||
<div class='dropdown'>
|
||||
|
||||
@@ -773,6 +773,11 @@ class story extends control
|
||||
|
||||
/* Get edited stories. */
|
||||
$stories = $this->dao->select('*')->from(TABLE_STORY)->where('id')->in($storyIDList)->fetchAll('id');
|
||||
foreach($stories as $story)
|
||||
{
|
||||
if($story->status == 'closed') unset($stories[$story->id]);
|
||||
}
|
||||
if(empty($stories)) die(js::alert($this->lang->story->notice->closed) . js::locate($this->session->storyList, 'parent'));
|
||||
|
||||
/* The stories of a product. */
|
||||
if($productID)
|
||||
|
||||
@@ -290,3 +290,6 @@ $lang->story->placeholder->estimate = $lang->story->hour;
|
||||
|
||||
$lang->story->chosen = new stdClass();
|
||||
$lang->story->chosen->reviewedBy = 'Choose Reviewer';
|
||||
|
||||
$lang->story->notice = new stdClass();
|
||||
$lang->story->notice->closed = 'Stories you selected have already been closed!';
|
||||
|
||||
@@ -290,3 +290,6 @@ $lang->story->placeholder->estimate = $lang->story->hour;
|
||||
|
||||
$lang->story->chosen = new stdClass();
|
||||
$lang->story->chosen->reviewedBy = '选择评审人...';
|
||||
|
||||
$lang->story->notice = new stdClass();
|
||||
$lang->story->notice->closed = '您选择的需求已经被关闭了!';
|
||||
|
||||
@@ -30,39 +30,28 @@
|
||||
<th class='w-p40 '> <?php echo $lang->story->comment;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<?php foreach($storyIDList as $storyID):?>
|
||||
<?php foreach($stories as $storyID => $story):?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo $storyID . html::hidden("storyIDList[$storyID]", $storyID);?></td>
|
||||
<td class='text-left'><?php echo $stories[$storyID]->title;?></td>
|
||||
<td class='story-<?php echo $stories[$storyID]->status;?>'><?php echo $lang->story->statusList[$stories[$storyID]->status];?></td>
|
||||
|
||||
<?php if($stories[$storyID]->status != 'closed'):?>
|
||||
<td class='text-left'><?php echo $story->title;?></td>
|
||||
<td class='story-<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
|
||||
<td>
|
||||
<?php if($stories[$storyID]->status == 'draft') unset($this->lang->story->reasonList['cancel']);?>
|
||||
<?php if($story->status == 'draft') unset($this->lang->story->reasonList['cancel']);?>
|
||||
<table class='w-p100'>
|
||||
<tr>
|
||||
<td class='pd-0'>
|
||||
<?php echo html::select("closedReasons[$storyID]", $lang->story->reasonList, 'done', "class=form-control onchange=setDuplicateAndChild(this.value,$storyID) style='min-width: 70px'");?>
|
||||
</td>
|
||||
<td class='pd-0' id='<?php echo 'duplicateStoryBox' . $storyID;?>' <?php if($stories[$storyID]->closedReason != 'duplicate') echo "style='display:none'";?>>
|
||||
<td class='pd-0' id='<?php echo 'duplicateStoryBox' . $storyID;?>' <?php if($story->closedReason != 'duplicate') echo "style='display:none'";?>>
|
||||
<?php echo html::input("duplicateStoryIDList[$storyID]", '', "class='form-control' placeholder='{$lang->idAB}' autocomplete='off'");?>
|
||||
</td>
|
||||
<td class='pd-0' id='<?php echo 'childStoryBox' . $storyID;?>' <?php if($stories[$storyID]->closedReason != 'subdivided') echo "style='display:none'";?>>
|
||||
<td class='pd-0' id='<?php echo 'childStoryBox' . $storyID;?>' <?php if($story->closedReason != 'subdivided') echo "style='display:none'";?>>
|
||||
<?php echo html::input("childStoriesIDList[$storyID]", '', "class='form-control' placeholder='{$lang->idAB}' autocomplete='off'");?>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
<td><?php echo html::input("comments[$storyID]", '', "class='form-control' autocomplete='off'");?></td>
|
||||
<?php else:?>
|
||||
<td>
|
||||
<div class='text-left'>
|
||||
<?php echo html::select("closedReasons[$storyID]", $lang->story->reasonList, $stories[$storyID]->closedReason, 'disabled="disabled" class="form-control"');?>
|
||||
</div>
|
||||
</td>
|
||||
<td><?php echo html::input("comments[$storyID]", '', "class='form-control' disabled='disabled' autocomplete='off'");?></td>
|
||||
<?php endif;?>
|
||||
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
<?php if(isset($suhosinInfo)):?>
|
||||
|
||||
@@ -17,6 +17,7 @@ $lang->task->batchChangeModule = "Batch Change Module";
|
||||
$lang->task->edit = "Update";
|
||||
$lang->task->delete = "Delete";
|
||||
$lang->task->deleted = "Deleted";
|
||||
$lang->task->delayed = 'Delayed';
|
||||
$lang->task->view = "Info";
|
||||
$lang->task->logEfforts = "Man-Hour Log";
|
||||
$lang->task->record = "Est.";
|
||||
|
||||
@@ -17,6 +17,7 @@ $lang->task->batchChangeModule = "批量修改模块";
|
||||
$lang->task->edit = "编辑";
|
||||
$lang->task->delete = "删除";
|
||||
$lang->task->deleted = "已删除";
|
||||
$lang->task->delayed = '延期';
|
||||
$lang->task->view = "查看任务";
|
||||
$lang->task->logEfforts = "记录工时";
|
||||
$lang->task->record = "工时";
|
||||
|
||||
@@ -48,9 +48,9 @@ $config->testcase->search['fields']['pri'] = $lang->testcase->pri;
|
||||
|
||||
$config->testcase->search['fields']['lastRunner'] = $lang->testcase->lastRunner;
|
||||
$config->testcase->search['fields']['lastRunResult'] = $lang->testcase->lastRunResult;
|
||||
$config->testcase->search['fields']['lastRunDate'] = $lang->testcase->lastRunDate;
|
||||
$config->testcase->search['fields']['openedDate'] = $lang->testcase->openedDate;
|
||||
$config->testcase->search['fields']['lastEditedDate'] = $lang->testcase->lastEditedDateAB;
|
||||
$config->testcase->search['fields']['lastRunDate'] = $lang->testcase->lastRunDate;
|
||||
|
||||
$config->testcase->search['params']['title'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
|
||||
$config->testcase->search['params']['module'] = array('operator' => 'belong', 'control' => 'select', 'values' => 'modules');
|
||||
@@ -67,9 +67,9 @@ $config->testcase->search['params']['stage'] = array('operator' => 'inclu
|
||||
|
||||
$config->testcase->search['params']['lastRunner'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
|
||||
$config->testcase->search['params']['lastRunResult'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->testcase->resultList);
|
||||
$config->testcase->search['params']['lastRunDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
|
||||
$config->testcase->search['params']['openedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
|
||||
$config->testcase->search['params']['lastEditedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
|
||||
$config->testcase->search['params']['lastRunDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
|
||||
|
||||
$config->testcase->datatable = new stdclass();
|
||||
$config->testcase->datatable->defaultField = array('id', 'pri', 'title', 'type', 'openedBy', 'lastRunner', 'lastRunDate', 'lastRunResult', 'status', 'bugs', 'results', 'actions');
|
||||
|
||||
@@ -44,10 +44,10 @@ $lang->testcase->allProduct = "All {$lang->productCommon}";
|
||||
$lang->testcase->fromBug = 'From Bug';
|
||||
$lang->testcase->toBug = 'To Bug';
|
||||
$lang->testcase->changed = 'Changed';
|
||||
$lang->testcase->bugs = '产生Bug数';
|
||||
$lang->testcase->bugs = 'Bugs Generated';
|
||||
$lang->testcase->bugsAB = 'B';
|
||||
$lang->testcase->results = '执行数';
|
||||
$lang->testcase->createBug = 'Transfer Bug';
|
||||
$lang->testcase->results = 'Results';
|
||||
$lang->testcase->createBug = 'Convert to Bug';
|
||||
$lang->case = $lang->testcase; // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
|
||||
|
||||
$lang->testcase->stepID = 'ID';
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
ok
|
||||
Reference in New Issue
Block a user