diff --git a/module/product/lang/de.php b/module/product/lang/de.php index 70ce917e14..cb2c62f7b8 100644 --- a/module/product/lang/de.php +++ b/module/product/lang/de.php @@ -214,8 +214,6 @@ $lang->product->noMatched = '"%s" kann nicht gefunden werden.' . $lang->pro $lang->product->featureBar['browse']['allstory'] = $lang->product->allStory; $lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed; $lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe; -$lang->product->featureBar['browse']['openedbyme'] = $lang->product->openedByMe; -$lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe; $lang->product->featureBar['browse']['reviewbyme'] = $lang->product->reviewByMe; $lang->product->featureBar['browse']['draftstory'] = $lang->product->draftStory; $lang->product->featureBar['browse']['more'] = $lang->more; diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php index 6e739efcc5..3cd0c4f4bb 100644 --- a/module/product/lang/fr.php +++ b/module/product/lang/fr.php @@ -214,8 +214,6 @@ $lang->product->noMatched = '"%s" cannot be found.' . $lang->productCommon; $lang->product->featureBar['browse']['allstory'] = $lang->product->allStory; $lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed; $lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe; -$lang->product->featureBar['browse']['openedbyme'] = $lang->product->openedByMe; -$lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe; $lang->product->featureBar['browse']['reviewbyme'] = $lang->product->reviewByMe; $lang->product->featureBar['browse']['draftstory'] = $lang->product->draftStory; $lang->product->featureBar['browse']['more'] = $lang->more; diff --git a/module/project/model.php b/module/project/model.php index c672ff613e..94c8d58ae7 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -617,17 +617,17 @@ class projectModel extends model } elseif($module == 'repo') { - $link = helper::createLink($module, 'browse', "repoID=&branchID=&objectID=%s#app=project"); + $link = helper::createLink($module, 'browse', "repoID=&branchID=&objectID=%s") . "#app=project"; } elseif($module == 'doc') { - $link = helper::createLink($module, 'tablecontents', "type=project&objectID=%s#app=project"); + $link = helper::createLink($module, 'tablecontents', "type=project&objectID=%s") . "#app=project"; } elseif($module == 'build') { if($method == 'create') { - $link = helper::createLink($module, $method, "executionID=&productID=&projectID=%s#app=project"); + $link = helper::createLink($module, $method, "executionID=&productID=&projectID=%s") . "#app=project"; } else { @@ -660,7 +660,7 @@ class projectModel extends model { if($method == 'projectsummary') { - $link = helper::createLink($module, $method, "projectID=%s#app=project"); + $link = helper::createLink($module, $method, "projectID=%s"). "#app=project"; } else { diff --git a/module/story/view/submitreview.html.php b/module/story/view/submitreview.html.php index d8865c9955..59037bfbff 100644 --- a/module/story/view/submitreview.html.php +++ b/module/story/view/submitreview.html.php @@ -27,7 +27,7 @@
| story->reviewedBy;?> | -reviewer)) echo "class='required'";?>> + | story->checkForceReview() or !empty($story->reviewer)) echo "class='required'";?>>
story->checkForceReview()):?>
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 2f7c3d0bcb..15f518d414 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -421,8 +421,9 @@ class testcase extends control
setcookie('caseModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
/* Use this session link, when the tab is not QA, a session of the case list exists, and the session is not from the Dynamic page. */
- $useSession = $this->app->tab != 'qa' and $this->session->caseList and strpos($this->session->caseList, 'dynamic') === false;
- $response['locate'] = $useSession ? $this->session->caseList : $this->createLink('testcase', 'browse', "productID={$this->post->product}&branch={$this->post->branch}&browseType=all¶m=0&orderBy=id_desc");
+ $useSession = ($this->app->tab != 'qa' and $this->session->caseList and strpos($this->session->caseList, 'dynamic') === false);
+ $locateLink = $this->app->tab == 'project' ? $this->createLink('project', 'testcase', "projectID={$this->session->project}") : $this->createLink('testcase', 'browse', "productID={$this->post->product}&branch={$this->post->branch}&browseType=all¶m=0&orderBy=id_desc");
+ $response['locate'] = $useSession ? $this->session->caseList : $locateLink;
return $this->send($response);
}
if(empty($this->products)) $this->locate($this->createLink('product', 'create'));
diff --git a/module/user/css/task.css b/module/user/css/task.css
index d305d64b16..1fd6df3362 100644
--- a/module/user/css/task.css
+++ b/module/user/css/task.css
@@ -2,3 +2,4 @@
.c-execution {width: 180px;}
.c-hour, .c-status {width: 70px;}
.c-deadline {width: 100px;}
+td.hours:last-child {padding-right: 14px;}
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 46aa04becf..98d37c538d 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -149,3 +149,4 @@ td.delayed > span {display: inline-block; height: 20px; line-height: 18px; backg
.table .table-children,
.table .is-nest-child {background: #F8F8F8;}
.table tbody td.has-child .icon-angle-right {color: #838a9d;}
+.table.has-sort-head thead > tr > th:last-child {padding-right: 8px;}
@@ -43,7 +43,7 @@
- reviewer, "class='form-control picker-select' multiple required");?>
+ reviewer, "class='form-control picker-select' multiple");?>
| ||
|---|---|---|---|---|