diff --git a/module/gitlab/control.php b/module/gitlab/control.php index 076f7e86e8..bde28ba333 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -327,7 +327,7 @@ class gitlab extends control ->fetchAll('issueID'); $iids = ''; foreach($savedIssueIDList as $savedIssueID) $iids = $iids . $savedIssueID->issueID . ','; - $options = '¬[iids]=' . trim($iids, ','); + $options = '&state=opened¬[iids]=' . trim($iids, ','); $gitlabIssues = $this->gitlab->apiGetIssues($gitlabID, $projectID, $options); //TODO(dingguodong) when no issues here? $products = array(); @@ -337,6 +337,7 @@ class gitlab extends control $products[$productID] = $this->loadModel("product")->getByID($productID)->name; } + $this->view->importable = empty($gitlabIssues) ? false : true; $this->view->products = $products; $this->view->gitlabID = $gitlabID; $this->view->gitlabProjectID = $projectID; diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php index e2df334a72..09ac42e021 100644 --- a/module/gitlab/lang/zh-cn.php +++ b/module/gitlab/lang/zh-cn.php @@ -36,8 +36,9 @@ $lang->gitlab->placeholder->name = ''; $lang->gitlab->placeholder->url = "请填写Gitlab Server首页的访问地址,如:https://gitlab.zentao.net。"; $lang->gitlab->placeholder->token = "请填写具有admin权限账户的access token"; -$lang->gitlab->tokenError = "当前token非管理员权限。"; -$lang->gitlab->hostError = "无效的gitlab服务地址。"; -$lang->gitlab->bindUserError = "不能重复绑定用户 %s"; -$lang->gitlab->importIssueError = "未选择该议题所属的执行。"; -$lang->gitlab->importIssueWarn = "存在导入失败的议题,可再次尝试导入。"; +$lang->gitlab->noImportableIssues = "目前没有可供导入的议题。"; +$lang->gitlab->tokenError = "当前token非管理员权限。"; +$lang->gitlab->hostError = "无效的gitlab服务地址。"; +$lang->gitlab->bindUserError = "不能重复绑定用户 %s"; +$lang->gitlab->importIssueError = "未选择该议题所属的执行。"; +$lang->gitlab->importIssueWarn = "存在导入失败的议题,可再次尝试导入。"; diff --git a/module/gitlab/view/importissue.html.php b/module/gitlab/view/importissue.html.php index c43fcc2e24..98ca018d8f 100644 --- a/module/gitlab/view/importissue.html.php +++ b/module/gitlab/view/importissue.html.php @@ -15,6 +15,7 @@

gitlab->importIssue;?>

+
@@ -46,8 +47,11 @@ -
+
-
+ + + gitlab->noImportableIssues; ?> +