diff --git a/module/action/control.php b/module/action/control.php
index be3f932140..da16b572bb 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -136,7 +136,6 @@ class action extends control
dao::$errors['submit'][] = $this->lang->action->historyEdit;
$this->send(array('result' => 'fail', 'message' => dao::getError()));
}
-
- die(js::locate($this->server->http_referer, 'parent'));
+ $this->send(array('result' => 'success', 'locate' => 'reload'));
}
}
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 6a988dc0a6..3b96649611 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -115,7 +115,7 @@ $lang->action->desc->finished = '$date, finished by $actoraction->desc->paused = '$date, paused by $actor.' . "\n";
$lang->action->desc->verified = '$date, verified by $actor.' . "\n";
$lang->action->desc->diff1 = '%s has been changed. It was "%s" and it is "%s".
' . "\n";
-$lang->action->desc->diff2 = '%s has been changed. The difference is ' . "\n" . "
%s
" . "\n%s
";
+$lang->action->desc->diff2 = '%s has been changed. The difference is ' . "\n" . "%s
" . "\n%s
";
$lang->action->desc->diff3 = 'File Name %s was changed to %s .' . "\n";
$lang->action->desc->linked2bug = '$date Linked to $extra by $actor';
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index ddc7c9f487..cec1875adc 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -116,7 +116,7 @@ $lang->action->desc->finished = '$date, 由 $actor 完成
$lang->action->desc->paused = '$date, 由 $actor 暂停。' . "\n";
$lang->action->desc->verified = '$date, 由 $actor 验收。' . "\n";
$lang->action->desc->diff1 = '修改了 %s,旧值为 "%s",新值为 "%s"。
' . "\n";
-$lang->action->desc->diff2 = '修改了 %s,区别为:' . "\n" . "%s
" . "\n%s
";
+$lang->action->desc->diff2 = '修改了 %s,区别为:' . "\n" . "%s
" . "\n%s
";
$lang->action->desc->diff3 = '将文件名 %s 改为 %s 。' . "\n";
$lang->action->desc->linked2bug = '$date 由 $actor 关联到版本 $extra';
diff --git a/module/bug/model.php b/module/bug/model.php
index d812de7b2d..f3a26b68de 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -26,25 +26,23 @@ class bugModel extends model
$this->loadModel('product')->setMenu($products, $productID, $branch, $moduleID, 'bug');
$selectHtml = $this->product->select($products, $productID, 'bug', 'browse', '', $branch, $moduleID, 'bug');
+ $this->app->loadLang('qa');
+ $productIndex = '' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '
';
+ $productIndex .= $selectHtml;
+
+ $this->lang->modulePageNav = $productIndex;
foreach($this->lang->bug->menu as $key => $menu)
{
if($this->config->global->flow != 'onlyTest')
{
- $replace = ($key == 'product') ? $selectHtml : $productID;
+ $replace = $productID;
}
else
{
- if($key == 'product')
- {
- $replace = $selectHtml;
- }
- else
- {
- $replace = array();
- $replace['productID'] = $productID;
- $replace['branch'] = $branch;
- $replace['param'] = $moduleID;
- }
+ $replace = array();
+ $replace['productID'] = $productID;
+ $replace['branch'] = $branch;
+ $replace['param'] = $moduleID;
}
common::setMenuVars($this->lang->bug->menu, $key, $replace);
}
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 297ab52f06..52a7281ae7 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -113,11 +113,11 @@
| bug->pri;?> |
- bug->priList, $bug->pri);?>'>bug->priList, $bug->pri)?> |
+ pri;?>'>bug->priList, $bug->pri)?> |
| bug->status;?> |
- bug->statusList[$bug->status];?> |
+ bug->statusList[$bug->status];?> |
| bug->activatedCount;?> |
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 682cfcf672..33d83a193c 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -235,38 +235,32 @@ $lang->build->menu = $lang->project->menu;
$lang->qa = new stdclass();
$lang->qa->menu = new stdclass();
-$lang->qa->menu->product = array('link' => '%s', 'fixed' => true);
$lang->qa->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->qa->menu->testcase = array('link' => '用例|testcase|browse|productID=%s');
$lang->qa->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s');
$lang->qa->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
$lang->qa->menu->report = array('link' => '报告|testreport|browse|productID=%s');
$lang->qa->menu->caselib = array('link' => '用例库|testsuite|library');
-$lang->qa->menu->index = array('link' => "测试主页|qa|index|locate=no&productID=%s", 'float' => 'right');
$lang->bug = new stdclass();
$lang->bug->menu = new stdclass();
-$lang->bug->menu->product = array('link' => '%s', 'fixed' => true);
$lang->bug->menu->bug = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,batchactivate,confirmbug,assignto', 'subModule' => 'tree');
$lang->bug->menu->testcase = array('link' => '用例|testcase|browse|productID=%s');
$lang->bug->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s');
$lang->bug->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
$lang->bug->menu->report = array('link' => '报告|testreport|browse|productID=%s');
$lang->bug->menu->caselib = array('link' => '用例库|testsuite|library');
-$lang->bug->menu->index = array('link' => "测试主页|qa|index|locate=no&productID=%s", 'float' => 'right');
$lang->testcase = new stdclass();
$lang->testcase->menu = new stdclass();
-$lang->testcase->menu->product = array('link' => '%s', 'fixed' => true);
$lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testcase->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree');
$lang->testcase->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report');
$lang->testcase->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
$lang->testcase->menu->report = array('link' => '报告|testreport|browse|productID=%s', 'alias' => 'view,create,edit');
$lang->testcase->menu->caselib = array('link' => '用例库|testsuite|library');
-$lang->testcase->menu->index = array('link' => "测试主页|qa|index|locate=no&productID=%s", 'float' => 'right');
$lang->testtask = new stdclass();
$lang->testtask->menu = $lang->testcase->menu;
@@ -277,15 +271,12 @@ $lang->testreport->menu = $lang->testcase->menu;
$lang->caselib = new stdclass();
$lang->caselib->menu = new stdclass();
-$lang->caselib->menu->lib = array('link' => '%s', 'fixed' => true);
$lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|');
$lang->caselib->menu->testcase = array('link' => '用例|testcase|browse|');
$lang->caselib->menu->testtask = array('link' => '测试单|testtask|browse|');
$lang->caselib->menu->testsuite = array('link' => '套件|testsuite|browse|');
$lang->caselib->menu->report = array('link' => '报告|testreport|browse|');
$lang->caselib->menu->caselib = array('link' => '用例库|testsuite|library', 'alias' => 'createlib,createcase,libview,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase');
-$lang->caselib->menu->create = array('link' => "创建库|testsuite|createLib|", 'float' => 'right');
-$lang->caselib->menu->index = array('link' => "测试主页|qa|index|locate=no&productID=%s", 'float' => 'right');
/* 文档视图菜单设置。*/
$lang->doc = new stdclass();
diff --git a/module/common/model.php b/module/common/model.php
index d5cdcbe2db..16173799b4 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -658,21 +658,44 @@ class commonModel extends model
/**
* Print icon of comment.
*
- * @param string $module
- * @param $object
+ * @param string $commentFormLink
+ * @param object $object
*
* @static
* @access public
* @return mixed
*/
- public static function printCommentIcon($module, $object = null)
+ public static function printCommentIcon($commentFormLink, $object = null)
{
if(isonlybody()) return false;
global $lang;
if(!commonModel::hasPriv('action', 'comment', $object)) return false;
- echo html::a('#commentBox', ' ' . $lang->action->create, '', "title='$lang->comment' onclick=\"toggleComment('#commentBox')\" class='btn btn-link pull-right'");
+ echo html::commonButton(' ' . $lang->action->create, "title='$lang->comment'", 'btn btn-link pull-right btn-comment');
+ echo <<