From d72a6625534109ef588b830b93df824eb897ea73 Mon Sep 17 00:00:00 2001 From: yfl <554665488@qq.com> Date: Fri, 12 Oct 2018 09:25:39 +0800 Subject: [PATCH 1/5] Finish task #5021,#5018,#5017,#5016,#5015,#5005,#5003,#4987,#4985,#4653 --- module/product/lang/en.php | 2 +- module/product/lang/zh-cn.php | 2 +- module/report/view/workload.html.php | 22 ++++++++-------------- module/story/model.php | 5 +++++ module/story/view/view.html.php | 2 +- module/todo/control.php | 2 +- module/todo/model.php | 4 ++-- module/user/view/create.html.php | 5 +++-- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 155d8e943c..adb19f4620 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -43,7 +43,7 @@ $lang->product->doc = 'Doc'; $lang->product->project = $lang->projectCommon . 'List'; $lang->product->build = 'Build'; -$lang->product->currentProject = 'Current Project'; +$lang->product->currentProject = "Current {$lang->projectCommon}"; $lang->product->activeStories = 'Activated Story'; $lang->product->changedStories = 'Changed Story'; $lang->product->draftStories = 'Draft Story'; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index ab4d14c638..854b6524ec 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -43,7 +43,7 @@ $lang->product->doc = '文档列表'; $lang->product->project = $lang->projectCommon . '列表'; $lang->product->build = '版本列表'; -$lang->product->currentProject = '当前项目'; +$lang->product->currentProject = '当前' . $lang->projectCommon; $lang->product->activeStories = '激活需求'; $lang->product->changedStories = '已变更需求'; $lang->product->draftStories = '草稿需求'; diff --git a/module/report/view/workload.html.php b/module/report/view/workload.html.php index 07afdd1955..2c7df29083 100644 --- a/module/report/view/workload.html.php +++ b/module/report/view/workload.html.php @@ -68,8 +68,8 @@
- - + + @@ -88,19 +88,13 @@ $info):?> ';?> - - - + + + - - - + + + '; $id ++;?> diff --git a/module/story/model.php b/module/story/model.php index 39b3123b75..889cfc1bd7 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -2320,6 +2320,11 @@ class storyModel extends model $title = $story->planTitle; $class .= ' text-ellipsis'; } + if($id == 'sourceNote') + { + $title = $story->sourceNote; + $class .= ' text-ellipsis'; + } echo "
report->user;?>
report->user;?> report->project;?> report->task;?> report->remain;?> createLink('project', 'view', "projectID={$info['projectID']}"), $project);?>createLink('project', 'view', "projectID={$info['projectID']}"), $project);?> - - - - - - "; switch($id) diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index ed9f8539fd..c2056d2b03 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -94,7 +94,7 @@ echo ""; } - if($from == 'project') common::printIcon('task', 'create', "project=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'smile', '', 'showinonlybody'); + if($from == 'project') common::printIcon('task', 'create', "project=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'plus', '', 'showinonlybody'); echo "
"; common::printIcon('story', 'edit', "storyID=$story->id", $story); diff --git a/module/todo/control.php b/module/todo/control.php index fb80cbcd48..cefd0c0983 100644 --- a/module/todo/control.php +++ b/module/todo/control.php @@ -340,7 +340,7 @@ class todo extends control $this->lang->set('menugroup.todo', $from); } - $this->view->title = "{$this->lang->todo->common} #$todo->id $todo->name"; + $this->view->title = $this->app->user->account == $todo->account ? "{$this->lang->todo->common} #$todo->id $todo->name" : $this->lang->todo->common ; $this->view->position[] = $this->lang->todo->view; $this->view->todo = $todo; $this->view->times = date::buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta); diff --git a/module/todo/model.php b/module/todo/model.php index 7e93163643..a13192cf59 100644 --- a/module/todo/model.php +++ b/module/todo/model.php @@ -383,14 +383,14 @@ class todoModel extends model ->beginIF($begin)->andWhere('date')->ge($begin)->fi() ->beginIF($end)->andWhere('date')->le($end)->fi() ->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi() - ->beginIF($status == 'undone')->andWhere('status')->ne('done')->fi() + ->beginIF($status == 'undone')->andWhere('status')->notin('done,closed')->fi() ->beginIF($date == 'cycle')->andWhere('cycle')->eq('1')->fi() ->beginIF($date != 'cycle')->andWhere('cycle')->eq('0')->fi() ->orderBy($orderBy) ->beginIF($limit > 0)->limit($limit)->fi() ->page($pager) ->query(); - + a($stmt); /* Set session. */ $sql = explode('WHERE', $this->dao->get()); $sql = explode('ORDER', $sql[1]); diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php index 8716008a40..3d4567617c 100644 --- a/module/user/view/create.html.php +++ b/module/user/view/create.html.php @@ -25,7 +25,7 @@ - + @@ -83,7 +83,8 @@ - + From 9e8ee6e8b889ee0b635f7851590df79cc260532d Mon Sep 17 00:00:00 2001 From: Yagami Date: Fri, 12 Oct 2018 09:30:00 +0800 Subject: [PATCH 2/5] * Fix doc lang file. --- module/doc/lang/en.php | 1 + module/doc/lang/zh-cn.php | 1 + module/doc/model.php | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 5302611ebb..66f77783bb 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -46,6 +46,7 @@ $lang->doc->users = 'Users'; $lang->doc->item = ' Items'; $lang->doc->num = 'Docs'; $lang->doc->searchResult = 'Search Result'; +$lang->doc->gt = '>'; $lang->doc->moduleDoc = 'By Module'; $lang->doc->searchDoc = 'Search'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index d88d74e775..708cf84278 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -46,6 +46,7 @@ $lang->doc->users = '用户'; $lang->doc->item = '项'; $lang->doc->num = '文档数量'; $lang->doc->searchResult = '搜索结果'; +$lang->doc->gt = '>'; $lang->doc->moduleDoc = '按模块浏览'; $lang->doc->searchDoc = '搜索'; diff --git a/module/doc/model.php b/module/doc/model.php index 6ac15e05e7..cb7cebd10b 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -1572,7 +1572,7 @@ class docModel extends model { $active = ''; if($param == $parentID) $active = "class='active'"; - $title .= html::a(helper::createLink('doc', 'browse', "libID=$libID&browseType=byModule¶m={$parentID}"), ' > ' . $moduleName->name , '', "$active"); + $title .= html::a(helper::createLink('doc', 'browse', "libID=$libID&browseType=byModule¶m={$parentID}"), " {$this->lang->doc->gt} " . $moduleName->name , '', "$active"); } return $title; From d1cd60221b1d1492f5e275cffad47ef4c3bf2f37 Mon Sep 17 00:00:00 2001 From: yfl <554665488@qq.com> Date: Fri, 12 Oct 2018 09:49:55 +0800 Subject: [PATCH 3/5] Remove test print --- module/todo/model.php | 1 - 1 file changed, 1 deletion(-) diff --git a/module/todo/model.php b/module/todo/model.php index a13192cf59..a884da6881 100644 --- a/module/todo/model.php +++ b/module/todo/model.php @@ -390,7 +390,6 @@ class todoModel extends model ->beginIF($limit > 0)->limit($limit)->fi() ->page($pager) ->query(); - a($stmt); /* Set session. */ $sql = explode('WHERE', $this->dao->get()); $sql = explode('ORDER', $sql[1]); From f7a59c0bfc4d5b443d73e8049a80663e8e79100c Mon Sep 17 00:00:00 2001 From: Yagami Date: Fri, 12 Oct 2018 09:58:27 +0800 Subject: [PATCH 4/5] * Finish task #5020.* Finish task #5020.* Finish task #5020.* Finish task #5020.* Finish task #5020.* Finish task #5020.* Finish task #5020.* Finish task #5020. --- module/misc/lang/en.php | 1 + module/misc/lang/zh-cn.php | 1 + module/misc/view/links.html.php | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 60be8722ab..f12bedfd52 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -13,6 +13,7 @@ $lang->misc = new stdclass(); $lang->misc->common = 'Misc'; $lang->misc->ping = 'Ping'; $lang->misc->api = 'https://api.zentao.net'; +$lang->misc->enApi = 'http://api.zentao.pm'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = 'Version %s'; diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 3b8027b65b..8533302d14 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -13,6 +13,7 @@ $lang->misc = new stdclass(); $lang->misc->common = '杂项'; $lang->misc->ping = '防超时'; $lang->misc->api = 'https://api.zentao.net'; +$lang->misc->enApi = 'http://api.zentao.pm'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = '版本%s'; diff --git a/module/misc/view/links.html.php b/module/misc/view/links.html.php index c75ed84927..d619486a46 100755 --- a/module/misc/view/links.html.php +++ b/module/misc/view/links.html.php @@ -9,8 +9,9 @@
    + getClientLang() == 'en' ? $lang->misc->enApi : $lang->misc->api;?> $label):?> -
  • misc->api . "/goto.php?item=$item&from=about", $label, '_blank', "id='$item'");;?>
    • +
From 2037cbd47a2ac8c35883d65c4d9e13911af22890 Mon Sep 17 00:00:00 2001 From: yfl <554665488@qq.com> Date: Fri, 12 Oct 2018 10:52:09 +0800 Subject: [PATCH 5/5] Finish task #5025 --- module/story/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/story/control.php b/module/story/control.php index 30c38b3576..35315cf7c9 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -1401,7 +1401,7 @@ class story extends control } else { - $stmt = $this->dbh->query($this->session->storyQueryCondition . ($this->post->exportType == 'selected' ? " AND t1.id IN({$this->cookie->checkedItem})" : '') . " ORDER BY " . strtr($orderBy, '_', ' ')); + $stmt = $this->dbh->query($this->session->storyQueryCondition . ($this->post->exportType == 'selected' ? " AND t2.id IN({$this->cookie->checkedItem})" : '') . " ORDER BY " . strtr($orderBy, '_', ' ')); while($row = $stmt->fetch()) $stories[$row->id] = $row; }
user->dept;?>
user->account;?>
+