diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index 6b50a2a403..381f068f75 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -11,6 +11,7 @@ */ ?> +
' id='todoform'>
@@ -22,7 +23,7 @@ echo '' . html::a(inlink('todo', "date=future"), $lang->todo->futureTodos) . ''; echo '' . html::a(inlink('todo', "date=all"), $lang->todo->allDaysTodos) . ''; echo '' . html::a(inlink('todo', "date=before&account={$app->user->account}&status=undone"), $lang->todo->allUndone) . ''; - echo "" . html::select('date', $dates, $date, 'onchange=changeDate(this.value)') . ''; + echo "" . html::input('date', $date,"class='select-2 date'") . ''; ?>
@@ -48,7 +49,6 @@ actions;?> - diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index d852d2e7bb..6f844d267d 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -34,7 +34,6 @@ var moduleID = '';
'>
- diff --git a/module/testtask/control.php b/module/testtask/control.php index ada83af44f..e8c19e74d8 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -207,7 +207,6 @@ class testtask extends control /* Load pager. */ $this->app->loadClass('pager', $static = true); $pager = pager::init($recTotal, $recPerPage, $pageID); - /* Set the browseType and moduleID. */ $browseType = strtolower($browseType); $moduleID = ($browseType == 'bymodule') ? (int)$param : 0; @@ -217,7 +216,6 @@ class testtask extends control if(!$task) die(js::error($this->lang->notFound) . js::locate('back')); $productID = $task->product; $this->testtask->setMenu($this->products, $productID); - if($browseType == 'bymodule' or $browseType == 'all') { $modules = ''; @@ -232,7 +230,6 @@ class testtask extends control $this->view->header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->cases; $this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]); $this->view->position[] = $this->lang->testtask->cases; - $this->view->productID = $productID; $this->view->productName = $this->products[$productID]; $this->view->task = $task; diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index f55c31eac0..46e74840b4 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -24,7 +24,6 @@ $lang->testtask->results = "结果"; $lang->testtask->createBug = "提Bug"; $lang->testtask->assign = '指派'; $lang->testtask->cases = '用例'; - $lang->testtask->common = '测试任务'; $lang->testtask->id = '任务编号'; $lang->testtask->product = '所属产品'; diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index 6b55bdbd7b..f504c9ffbb 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -89,7 +89,7 @@ var moduleID = '';
@@ -49,12 +48,12 @@ var moduleID = ''; recTotal}&recPerPage={$pager->recPerPage}"; ?> - +
- + @@ -62,7 +61,7 @@ var moduleID = ''; - + @@ -98,6 +97,7 @@ var moduleID = ''; +
idAB);?> priAB);?>testcase->title);?>testcase->title);?> testcase->story);?> actions;?> typeAB);?> openedByAB);?> testtask->lastRunAccount);?>testtask->lastRunTime);?> testtask->lastRunTime);?> testtask->lastRunResult);?> statusAB);?> actions;?>
show();?>
- testtask->assign); ?>