diff --git a/db/zentao.sql b/db/zentao.sql index 4f22fb1391..a703e2e0b0 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -844,6 +844,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'product', 'project'), (1, 'product', 'roadmap'), (1, 'product', 'view'), +(1, 'product', 'updateOrder'), (1, 'productplan', 'batchUnlinkBug'), (1, 'productplan', 'batchUnlinkStory'), (1, 'productplan', 'browse'), @@ -888,6 +889,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1, 'project', 'unlinkMember'), (1, 'project', 'unlinkStory'), (1, 'project', 'view'), +(1, 'project', 'updateOrder'), (1, 'qa', 'index'), (1, 'release', 'batchUnlinkBug'), (1, 'release', 'batchUnlinkStory'), @@ -1477,6 +1479,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4, 'project', 'unlinkMember'), (4, 'project', 'unlinkStory'), (4, 'project', 'view'), +(4, 'project', 'updateOrder'), (4, 'qa', 'index'), (4, 'release', 'browse'), (4, 'release', 'export'), @@ -1646,6 +1649,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5, 'product', 'project'), (5, 'product', 'roadmap'), (5, 'product', 'view'), +(5, 'product', 'updateOrder'), (5, 'productplan', 'batchUnlinkBug'), (5, 'productplan', 'batchUnlinkStory'), (5, 'productplan', 'browse'), @@ -1690,6 +1694,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (5, 'project', 'unlinkMember'), (5, 'project', 'unlinkStory'), (5, 'project', 'view'), +(5, 'project', 'updateOrder'), (5, 'qa', 'index'), (5, 'release', 'batchUnlinkBug'), (5, 'release', 'batchUnlinkStory'), @@ -1902,6 +1907,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (6, 'project', 'unlinkMember'), (6, 'project', 'unlinkStory'), (6, 'project', 'view'), +(6, 'project', 'updateOrder'), (6, 'qa', 'index'), (6, 'release', 'browse'), (6, 'release', 'export'), @@ -2069,6 +2075,7 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (7, 'product', 'project'), (7, 'product', 'roadmap'), (7, 'product', 'view'), +(7, 'product', 'updateOrder'), (7, 'productplan', 'batchUnlinkBug'), (7, 'productplan', 'batchUnlinkStory'), (7, 'productplan', 'browse'), diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 8fd2aeefaf..68d499a48b 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -116,19 +116,20 @@ $lang->todo->methodOrder[40] = 'import2Today'; /* Product. */ $lang->resource->product = new stdclass(); -$lang->resource->product->index = 'index'; -$lang->resource->product->browse = 'browse'; -$lang->resource->product->create = 'create'; -$lang->resource->product->view = 'view'; -$lang->resource->product->edit = 'edit'; -$lang->resource->product->batchEdit = 'batchEdit'; -$lang->resource->product->order = 'order'; -$lang->resource->product->delete = 'delete'; -$lang->resource->product->roadmap = 'roadmap'; -$lang->resource->product->doc = 'doc'; -$lang->resource->product->dynamic = 'dynamic'; -$lang->resource->product->project = 'project'; -$lang->resource->product->close = 'close'; +$lang->resource->product->index = 'index'; +$lang->resource->product->browse = 'browse'; +$lang->resource->product->create = 'create'; +$lang->resource->product->view = 'view'; +$lang->resource->product->edit = 'edit'; +$lang->resource->product->batchEdit = 'batchEdit'; +$lang->resource->product->order = 'order'; +$lang->resource->product->delete = 'delete'; +$lang->resource->product->roadmap = 'roadmap'; +$lang->resource->product->doc = 'doc'; +$lang->resource->product->dynamic = 'dynamic'; +$lang->resource->product->project = 'project'; +$lang->resource->product->close = 'close'; +$lang->resource->product->updateOrder = 'updateOrder'; $lang->product->methodOrder[0] = 'index'; $lang->product->methodOrder[5] = 'browse'; @@ -143,6 +144,7 @@ $lang->product->methodOrder[45] = 'doc'; $lang->product->methodOrder[50] = 'dynamic'; $lang->product->methodOrder[55] = 'project'; $lang->product->methodOrder[60] = 'close'; +$lang->product->methodOrder[65] = 'updateOrder'; /* Story. */ $lang->resource->story = new stdclass(); @@ -275,6 +277,7 @@ $lang->resource->project->unlinkMember = 'unlinkMember'; $lang->resource->project->linkStory = 'linkStory'; $lang->resource->project->unlinkStory = 'unlinkStory'; $lang->resource->project->batchUnlinkStory = 'batchUnlinkStory'; +$lang->resource->project->updateOrder = 'updateOrder'; $lang->project->methodOrder[0] = 'index'; $lang->project->methodOrder[5] = 'view'; @@ -309,6 +312,7 @@ $lang->project->methodOrder[145] = 'unlinkMember'; $lang->project->methodOrder[150] = 'linkStory'; $lang->project->methodOrder[155] = 'unlinkStory'; $lang->project->methodOrder[160] = 'batchUnlinkStory'; +$lang->project->methodOrder[165] = 'updateOrder'; /* Task. */ $lang->resource->task = new stdclass(); @@ -1068,3 +1072,5 @@ $lang->changelog['7.2'][] = 'admin-checkWeak'; $lang->changelog['7.2'][] = 'backup-change'; $lang->changelog['7.2'][] = 'custom-flow'; $lang->changelog['7.2'][] = 'group-manageView'; +$lang->changelog['7.2'][] = 'product-updateOrder'; +$lang->changelog['7.2'][] = 'project-updateOrder'; diff --git a/module/product/control.php b/module/product/control.php index 9dc7bfea38..a82b881d46 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -565,12 +565,12 @@ class product extends control } /** - * Ajax order. + * Update order. * * @access public * @return void */ - public function ajaxOrder() + public function updateOrder() { $idList = explode(',', trim($this->post->products, ',')); $orderBy = $this->post->orderBy; diff --git a/module/product/js/index.js b/module/product/js/index.js index 3ecd7f64e3..f35f9625b9 100644 --- a/module/product/js/index.js +++ b/module/product/js/index.js @@ -4,6 +4,6 @@ $(function() { var list = ''; for(i = 0; i < data.list.length; i++) list += $(data.list[i]).attr('data-id') + ','; - $.post(createLink('product', 'ajaxOrder'), {'products' : list, 'orderBy' : orderBy}); + $.post(createLink('product', 'updateOrder'), {'products' : list, 'orderBy' : orderBy}); }); }); diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index 64e9583ea4..785076bd7c 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -9,22 +9,23 @@ * @version $Id: zh-cn.php 5091 2013-07-10 06:06:46Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->product->common = '产品视图'; -$lang->product->index = "产品首页"; -$lang->product->browse = "浏览产品"; -$lang->product->dynamic = "动态"; -$lang->product->view = "产品概况"; -$lang->product->edit = "编辑产品"; -$lang->product->batchEdit = "批量编辑"; -$lang->product->create = "新增产品"; -$lang->product->read = "产品详情"; -$lang->product->delete = "删除产品"; -$lang->product->deleted = "已删除"; -$lang->product->close = "关闭"; -$lang->product->select = '--请选择产品--'; -$lang->product->mine = '我负责：'; -$lang->product->other = '其他：'; -$lang->product->closed = '已关闭'; +$lang->product->common = '产品视图'; +$lang->product->index = "产品首页"; +$lang->product->browse = "浏览产品"; +$lang->product->dynamic = "动态"; +$lang->product->view = "产品概况"; +$lang->product->edit = "编辑产品"; +$lang->product->batchEdit = "批量编辑"; +$lang->product->create = "新增产品"; +$lang->product->read = "产品详情"; +$lang->product->delete = "删除产品"; +$lang->product->deleted = "已删除"; +$lang->product->close = "关闭"; +$lang->product->select = '--请选择产品--'; +$lang->product->mine = '我负责：'; +$lang->product->other = '其他：'; +$lang->product->closed = '已关闭'; +$lang->product->updateOrder = "排序"; $lang->product->basicInfo = '基本信息'; $lang->product->otherInfo = '其他信息'; diff --git a/module/product/view/index.html.php b/module/product/view/index.html.php index 0d1536c6cb..fda19fa61e 100644 --- a/module/product/view/index.html.php +++ b/module/product/view/index.html.php @@ -31,6 +31,7 @@ +
'> recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> @@ -47,7 +48,9 @@ - + + + @@ -70,19 +73,22 @@ + + - diff --git a/module/project/control.php b/module/project/control.php index 2fe6b06a2a..666d9125ac 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -1728,12 +1728,12 @@ class project extends control } /** - * Ajax order. + * Update order. * * @access public * @return void */ - public function ajaxOrder() + public function updateOrder() { $idList = explode(',', trim($this->post->projects, ',')); $orderBy = $this->post->orderBy; diff --git a/module/project/js/index.js b/module/project/js/index.js index a92008523b..c76ab9a889 100644 --- a/module/project/js/index.js +++ b/module/project/js/index.js @@ -4,7 +4,7 @@ $(function() { var list = ''; for(i = 0; i < data.list.length; i++) list += $(data.list[i]).attr('data-id') + ','; - $.post(createLink('project', 'ajaxOrder'), {'projects' : list, 'orderBy' : orderBy}); + $.post(createLink('project', 'updateOrder'), {'projects' : list, 'orderBy' : orderBy}); }); }); diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 14a8fc4a98..380f307e1d 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -62,6 +62,7 @@ $lang->project->typeDesc = 'No burndown and story in OPS'; $lang->project->mine = 'I charge : '; $lang->project->other = 'Other : '; $lang->project->deleted = 'Deleted'; +$lang->project->updateOrder = 'Order'; $lang->project->start = 'Start'; $lang->project->activate = 'Activate'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 9856e42f35..171028d6f9 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -62,6 +62,7 @@ $lang->project->typeDesc = '运维项目禁用燃尽图和需求。'; $lang->project->mine = '我负责：'; $lang->project->other = '其他：'; $lang->project->deleted = '已删除'; +$lang->project->updateOrder = '排序'; $lang->project->start = '开始'; $lang->project->activate = '激活'; diff --git a/module/project/view/index.html.php b/module/project/view/index.html.php index 508ff17da4..22106ffb53 100644 --- a/module/project/view/index.html.php +++ b/module/project/view/index.html.php @@ -26,6 +26,7 @@ " . html::select('product', $products, $productID, "class='chosen' onchange='byProduct(this.value, $projectID)'") . '';?> +'>
product->bugs;?> bug->unResolved;?> bug->assignToNull;?>');?>product->updateOrder);?>
bugs?> unResolved;?> assignToNull;?>
'> - +
+ " . html::selectButton() . '
';?> product->batchEdit, '', '');?> + + recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"), $lang->project->updateOrder);?> -
show();?>
recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> @@ -42,7 +43,9 @@ - + + + @@ -68,19 +71,22 @@ hours->progress;?>% + + - diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php index 26de5ccb37..48a0635117 100644 --- a/module/project/view/story.html.php +++ b/module/project/view/story.html.php @@ -136,7 +136,7 @@ $misc = "onclick=\"setFormAction('$actionLink')\""; echo '
  • ' . html::a('#', $lang->close, '', $misc) . '
    • '; } - if(common::hasPriv('story', 'batchUnlinkStory')) + if(common::hasPriv('project', 'batchUnlinkStory')) { $actionLink = $this->createLink('project', 'batchUnlinkStory', "projectID=$project->id"); $misc = "onclick=\"setFormAction('$actionLink')\"";
    project->totalLeft;?> project->progess;?> project->burn;?>');?>project->updateOrder);?>
    burns);?>'>
    '> - +
    - " . html::selectButton() . '
    ';?> - project->batchEdit);?> + + " . html::selectButton() . '';?> + project->batchEdit);?> + + recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"), $lang->project->updateOrder, '', "class='btn'");?> -
    show();?>