From 361521adee419b24a69f6c9d6276aac943f8da00 Mon Sep 17 00:00:00 2001 From: pengjiangxiu Date: Tue, 25 Jul 2017 13:35:16 +0800 Subject: [PATCH] * Adjust code. --- config/filter.php | 2 +- module/action/lang/zh-cn.php | 2 ++ module/admin/control.php | 1 + module/build/control.php | 2 ++ module/build/css/view.css | 3 +++ module/build/lang/zh-cn.php | 1 - module/build/model.php | 4 ++-- module/build/view/create.html.php | 2 +- module/build/view/linkstory.html.php | 10 +++++----- module/common/lang/en.php | 2 +- module/common/lang/zh-cn.php | 2 +- module/common/lang/zh-tw.php | 2 +- module/productplan/css/view.css | 3 +++ module/productplan/view/linkbug.html.php | 6 +++--- module/productplan/view/linkstory.html.php | 10 +++++----- module/project/control.php | 9 +++++---- module/todo/view/batchedit.html.php | 1 - 17 files changed, 36 insertions(+), 26 deletions(-) diff --git a/config/filter.php b/config/filter.php index 34eb11263f..868577e010 100644 --- a/config/filter.php +++ b/config/filter.php @@ -11,7 +11,7 @@ $filter->rules->orderBy = '/^\w+_(desc|asc)$/i'; $filter->rules->browseType = '/^by\w+$/i'; $filter->rules->word = '/^\w+$/'; $filter->rules->paramName = '/^[a-zA-Z0-9_\.]+$/'; -$filter->rules->paramValue = '/^[a-zA-Z0-9=_,`#+\s\^\/\.%\|\x7f-\xff]+$/'; +$filter->rules->paramValue = '/^[a-zA-Z0-9=_,`#+\^\/\.%\|\x7f-\xff]+$/'; $filter->default = new stdclass(); $filter->default->moduleName = 'code'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 1f2b80f298..2a9707252b 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -168,6 +168,8 @@ $lang->action->label->suspended = '挂起'; $lang->action->label->login = '登录系统'; $lang->action->label->logout = "退出登录"; $lang->action->label->deleteestimate = "删除了工时"; +$lang->action->label->linked2build = "关联版本"; +$lang->action->label->linked2bug = "关联BUG"; /* 用来生成相应对象的链接。*/ $lang->action->label->product = $lang->productCommon . '|product|view|productID=%s'; diff --git a/module/admin/control.php b/module/admin/control.php index 86ecabbaaa..e2c5fc52d6 100644 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -211,6 +211,7 @@ class admin extends control $ssoConfig->code = trim($this->post->code); $ssoConfig->key = trim($this->post->key); + if(!$ssoConfig->turnon) $ssoConfig->redirect = $ssoConfig->turnon; $this->loadModel('setting')->setItems('system.sso', $ssoConfig); if(dao::isError()) die(js::error(dao::getError())); die($this->locate(inlink('sso'))); diff --git a/module/build/control.php b/module/build/control.php index d9b1fa94ba..0dea72eb45 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -28,6 +28,8 @@ class build extends control die(js::locate($this->createLink('build', 'view', "buildID=$buildID"), 'parent')); } + $this->session->set('buildCreate', $this->app->getURI(true)); + /* Load these models. */ $this->loadModel('project'); $this->loadModel('user'); diff --git a/module/build/css/view.css b/module/build/css/view.css index 82742a2161..95edbdd747 100644 --- a/module/build/css/view.css +++ b/module/build/css/view.css @@ -9,3 +9,6 @@ .tabs .tab-content .tab-pane #querybox form {padding-left:0px;} .table-actions {padding-left: 5px;} + +#querybox form {margin: 0px !important;} +#moreOrLite {right: 0px !important;} diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php index a1bbc051eb..4f6709773d 100644 --- a/module/build/lang/zh-cn.php +++ b/module/build/lang/zh-cn.php @@ -13,7 +13,6 @@ $lang->build->common = "版本"; $lang->build->create = "创建版本"; $lang->build->edit = "编辑版本"; $lang->build->linkStory = "关联需求"; -$lang->build->linked2build = "关联版本"; $lang->build->linkBug = "关联Bug"; $lang->build->delete = "删除版本"; $lang->build->deleted = "已删除"; diff --git a/module/build/model.php b/module/build/model.php index 285baca992..2d0c382285 100644 --- a/module/build/model.php +++ b/module/build/model.php @@ -304,7 +304,7 @@ class buildModel extends model $this->dao->update(TABLE_BUILD)->set('stories')->eq($build->stories)->where('id')->eq((int)$buildID)->exec(); foreach($this->post->stories as $storyID) { - $this->loadModel('action')->create('story', $storyID, $this->lang->build->linked2build, '', $buildID); + $this->loadModel('action')->create('story', $storyID, 'linked2build', '', $buildID); } } @@ -363,7 +363,7 @@ class buildModel extends model $this->dao->update(TABLE_BUILD)->set('bugs')->eq($build->bugs)->where('id')->eq((int)$buildID)->exec(); foreach($this->post->bugs as $bugID) { - $this->loadModel('action')->create('bug', $bugID, $this->lang->build->linkBug, '', $buildID); + $this->loadModel('action')->create('bug', $bugID, 'linked2bug', '', $buildID); } } diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php index 09bbc97c79..f6ca6159da 100644 --- a/module/build/view/create.html.php +++ b/module/build/view/create.html.php @@ -39,7 +39,7 @@ - build->noProduct, $this->createLink('project', 'manageproducts', "module=build&method=create&projectID=$projectID"));?> + build->noProduct, $this->createLink('project', 'manageproducts', "projectID=$projectID&from=buildCreate"));?> diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php index 10278f6e67..205dfa26b0 100644 --- a/module/build/view/linkstory.html.php +++ b/module/build/view/linkstory.html.php @@ -38,11 +38,11 @@ story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri)?> createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?> - openedBy];?> - assignedTo];?> - estimate;?> - story->statusList[$story->status];?> - story->stageList[$story->stage];?> + openedBy];?> + assignedTo];?> + estimate;?> + story->statusList[$story->status];?> + story->stageList[$story->stage];?> diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 5ca4f64ef8..2c9b16a47f 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -221,7 +221,7 @@ $lang->project->menu->build = array('link' => 'Build|project|build|projectID $lang->project->menu->testtask = array('link' => 'Test Task|project|testtask|projectID=%s'); $lang->project->menu->team = array('link' => 'Team|project|team|projectID=%s', 'alias' => 'managemembers'); $lang->project->menu->doc = array('link' => 'Document|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc'); -$lang->project->menu->product = $lang->productCommon . '|project|manageproducts|module=project&method=browse&projectID=%s'; +$lang->project->menu->product = $lang->productCommon . '|project|manageproducts|projectID=%s'; $lang->project->menu->view = array('link' => 'Overview|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); $lang->project->menu->create = array('link' => " Add{$lang->projectCommon}|project|create", 'float' => 'right'); $lang->project->menu->all = array('link' => " All{$lang->projectCommon}|project|all|status=undone&projectID=%s", 'float' => 'right'); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index c1b71a1990..e93f84aff7 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -221,7 +221,7 @@ $lang->project->menu->build = array('link' => '版本|project|build|projectI $lang->project->menu->testtask = array('link' => '测试|project|testtask|projectID=%s'); $lang->project->menu->team = array('link' => '团队|project|team|projectID=%s', 'alias' => 'managemembers'); $lang->project->menu->doc = array('link' => '文档|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc'); -$lang->project->menu->product = $lang->productCommon . '|project|manageproducts|module=project&method=browse&projectID=%s'; +$lang->project->menu->product = $lang->productCommon . '|project|manageproducts|projectID=%s'; $lang->project->menu->view = array('link' => '概况|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); $lang->project->menu->create = array('link' => " 添加{$lang->projectCommon}|project|create", 'float' => 'right'); $lang->project->menu->all = array('link' => " 所有{$lang->projectCommon}|project|all|status=undone&projectID=%s", 'float' => 'right'); diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 6fc95e10b5..20c8c793a1 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -221,7 +221,7 @@ $lang->project->menu->build = array('link' => '版本|project|build|projectI $lang->project->menu->testtask = array('link' => '測試|project|testtask|projectID=%s'); $lang->project->menu->team = array('link' => '團隊|project|team|projectID=%s', 'alias' => 'managemembers'); $lang->project->menu->doc = array('link' => '文檔|doc|objectLibs|type=project&objectID=%s&from=project', 'subModule' => 'doc'); -$lang->project->menu->product = $lang->productCommon . '|project|manageproducts|module=project&method=browse&projectID=%s'; +$lang->project->menu->product = $lang->productCommon . '|project|manageproducts|projectID=%s'; $lang->project->menu->view = array('link' => '概況|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close'); $lang->project->menu->create = array('link' => " 添加{$lang->projectCommon}|project|create", 'float' => 'right'); $lang->project->menu->all = array('link' => " 所有{$lang->projectCommon}|project|all|status=undone&projectID=%s", 'float' => 'right'); diff --git a/module/productplan/css/view.css b/module/productplan/css/view.css index 1359408a1f..ae4e807510 100644 --- a/module/productplan/css/view.css +++ b/module/productplan/css/view.css @@ -25,3 +25,6 @@ input[type=checkbox].ml-10px{margin-left:10px;} #planInfo {border-top: 1px solid #ddd;} #planInfo > div {padding-top: 15px;} + +#querybox form {margin: 0px !important;} +#moreOrLite {right: 0px !important;} diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php index 36840814f1..66c07a5fd9 100644 --- a/module/productplan/view/linkbug.html.php +++ b/module/productplan/view/linkbug.html.php @@ -42,9 +42,9 @@ include '../../common/view/tablesorter.html.php'; bug->priList, $bug->pri, $bug->pri);?>'>bug->priList, $bug->pri, $bug->pri)?> createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?> - openedBy];?> - assignedTo];?> - bug->statusList[$bug->status];?> + openedBy];?> + assignedTo];?> + bug->statusList[$bug->status];?> diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php index 52904e9f31..46fcfa0f7a 100644 --- a/module/productplan/view/linkstory.html.php +++ b/module/productplan/view/linkstory.html.php @@ -45,11 +45,11 @@ include '../../common/view/tablesorter.html.php'; planTitle;?> module];?> createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?> - openedBy);?> - assignedTo);?> - estimate;?> - story->statusList[$story->status];?> - story->stageList[$story->stage];?> + openedBy);?> + assignedTo);?> + estimate;?> + story->statusList[$story->status];?> + story->stageList[$story->stage];?> diff --git a/module/project/control.php b/module/project/control.php index 4943c58f2d..be761ebfdc 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -1430,14 +1430,16 @@ class project extends control * @access public * @return void */ - public function manageProducts($module,$method,$projectID) + public function manageProducts($projectID, $from='') { /* use first project if projectID does not exist. */ if(!isset($this->projects[$projectID])) $projectID = key($this->projects); - $browseProjectLink = $this->createLink($module, $method, "projectID=$projectID"); + $browseProjectLink = $this->createLink('project', 'browse', "projectID=$projectID"); if(!empty($_POST)) { + if($from == 'buildCreate' && $this->session->buildCreate) $browseProjectLink = $this->session->buildCreate; + $this->project->updateProducts($projectID); if(dao::isError()) dis(js::error(dao::getError())); die(js::locate($browseProjectLink)); @@ -1625,8 +1627,7 @@ class project extends control if(empty($products)) { echo js::alert($this->lang->project->errorNoLinkedProducts); - - die(js::locate($this->createLink('project', 'manageproducts', "module=project&method=browse&projectID=$projectID"))); + die(js::locate($this->createLink('project', 'manageproducts', "projectID=$projectID"))); } if(!empty($_POST)) diff --git a/module/todo/view/batchedit.html.php b/module/todo/view/batchedit.html.php index 6d705795b0..cae87e63ca 100644 --- a/module/todo/view/batchedit.html.php +++ b/module/todo/view/batchedit.html.php @@ -12,7 +12,6 @@ ?> -todo->noTodo);?>
icons['todo']);?>