diff --git a/trunk/module/tree/control.php b/trunk/module/tree/control.php index 3f7367eee6..9f88952fbe 100644 --- a/trunk/module/tree/control.php +++ b/trunk/module/tree/control.php @@ -90,6 +90,7 @@ class tree extends control $this->view->product = $product; $this->view->viewType = $viewType; $this->view->modules = $this->tree->getTreeMenu($productID, $viewType, $rooteModuleID = 0, array('treeModel', 'createManageLink')); + $this->view->productModules = $this->tree->getOptionMenu($productID, 'story'); $this->view->sons = $this->tree->getSons($productID, $currentModuleID, $viewType); $this->view->currentModuleID = $currentModuleID; $this->view->parentModules = $parentModules; @@ -157,4 +158,16 @@ class tree extends control $optionMenu = $this->tree->getOptionMenu($productID, $viewType, $rootModuleID); die( html::select("module", $optionMenu, '', 'onchange=setAssignedTo()')); } + + /* ajax请求: 返回某一个模块的son模块.*/ + public function ajaxGetSonModules($moduleID, $productID = 0) + { + if($moduleID) die(json_encode($this->dao->findByParent($moduleID)->from(TABLE_MODULE)->fetchPairs('id', 'name'))); + $modules = $this->dao->select('id, name')->from(TABLE_MODULE) + ->where('root')->eq($productID) + ->andWhere('parent')->eq('0') + ->andWhere('type')->eq('story') + ->fetchPairs(); + die(json_encode($modules)); + } } diff --git a/trunk/module/tree/lang/zh-cn.php b/trunk/module/tree/lang/zh-cn.php index d3a6d68dd6..e8c2bfc207 100644 --- a/trunk/module/tree/lang/zh-cn.php +++ b/trunk/module/tree/lang/zh-cn.php @@ -21,25 +21,26 @@ * @version $Id$ * @link http://www.zentaoms.com */ -$lang->tree->common = '模块维护'; -$lang->tree->add = "添加"; -$lang->tree->edit = "编辑"; -$lang->tree->addChild = "添加子模块"; -$lang->tree->delete = "删除模块"; -$lang->tree->browse = "模块维护"; -$lang->tree->manage = "维护模块"; -$lang->tree->manageProduct= "维护产品视图模块"; -$lang->tree->manageProject= "维护项目视图模块"; -$lang->tree->manageBug = "维护QA视图模块"; -$lang->tree->manageCase = "维护用例视图模块"; -$lang->tree->updateOrder = "更新排序"; -$lang->tree->manageChild = "维护子模块"; -$lang->tree->child = "子模块"; -$lang->tree->owner = "负责人"; -$lang->tree->ajaxGetOptionMenu = "接口:获取下拉列表"; +$lang->tree->common = '模块维护'; +$lang->tree->add = '添加'; +$lang->tree->edit = '编辑'; +$lang->tree->addChild = '添加子模块'; +$lang->tree->delete = '删除模块'; +$lang->tree->browse = '模块维护'; +$lang->tree->manage = '维护模块'; +$lang->tree->manageProduct = '维护产品视图模块'; +$lang->tree->manageProject = '维护项目视图模块'; +$lang->tree->manageBug = '维护QA视图模块'; +$lang->tree->manageCase = '维护用例视图模块'; +$lang->tree->updateOrder = '更新排序'; +$lang->tree->manageChild = '维护子模块'; +$lang->tree->syncFromProduct = '复制产品视图模块'; +$lang->tree->ajaxGetOptionMenu = '接口:获取下拉列表'; -$lang->tree->confirmDelete = "您确定删除该模块吗?"; -$lang->tree->successSave = "成功保存"; +$lang->tree->confirmDelete = '您确定删除该模块吗?'; +$lang->tree->successSave = '成功保存'; $lang->tree->name = '模块名称'; $lang->tree->parent = '上级模块'; +$lang->tree->child = '子模块'; +$lang->tree->owner = '负责人'; diff --git a/trunk/module/tree/view/browse.html.php b/trunk/module/tree/view/browse.html.php index a9edb8f89f..5aa790f80c 100644 --- a/trunk/module/tree/view/browse.html.php +++ b/trunk/module/tree/view/browse.html.php @@ -25,6 +25,28 @@