Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/178_hufangzhou_mergebranchpriv' into 'master'

Browse Source 
* Resolve the issue of merge branch.

See merge request easycorp/zentaopms!1058
This commit is contained in:
孙广明
2021-12-22 02:08:40 +00:00
parent 1b05d78e65 5b0923a7a3
commit 75fa4d2dd2
7 changed files with 50 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+2
View File
@@ -998,6 +998,7 @@ class actionModel extends model
{
$this->app->loadLang('todo');
$this->app->loadLang('stakeholder');
$this->app->loadLang('branch');
/* Get commiters and the same department users. */
$commiters = $this->loadModel('user')->getCommiters();
@@ -1021,6 +1022,7 @@ class actionModel extends model
if($action->objectType == 'branch' and $action->action == 'mergedbranch')
{
if($action->objectID == 0) $action->objectName = $this->lang->branch->main;
$action->objectName = '"' . $action->extra . ' "' . $this->lang->action->to . ' "' . $action->objectName . '"';
}
module/branch/control.php
+1
View File
@@ -316,6 +316,7 @@ class branch extends control
$mergeToBranch = $_POST['createBranch'] ? '' : $_POST['targetBranch'];
return $branch != 0 and $branch != $mergeToBranch;
});
$mergedBranchIDList = implode(',', $mergedBranches);
$mergedBranches = $this->dao->select('id,name')->from(TABLE_BRANCH)->where('id')->in($mergedBranchIDList)->fetchPairs();
module/branch/js/manage.js
+1 -1
View File
@@ -49,7 +49,7 @@ $(function()
{
$("input[id*='branchIDList']").each(function()
{
if($(this).prop('checked') && $(this).closest('tr').data('status') === 'closed')
if($(this).prop('checked') && ($(this).closest('tr').data('status') === 'closed' || $(this).closest('tr').data('id') == '0'))
{
$("a[href='#mergeBranch']").hide();
return false;
module/branch/lang/en.php
+16 -15
View File
@@ -9,21 +9,22 @@ $lang->branch->manageTitle = '%s Management';
$lang->branch->all = 'All ';
$lang->branch->main = 'Main';
$lang->branch->edit = 'Edit %s';
$lang->branch->editAction = 'Edit Branch';
$lang->branch->activate = 'Activate';
$lang->branch->activateAction = 'Activate Branch';
$lang->branch->close = 'Close';
$lang->branch->closeAction = 'Close Branch';
$lang->branch->create = 'Create %s';
$lang->branch->createAction = 'Create Branch';
$lang->branch->merge = 'Merge';
$lang->branch->batchEdit = 'Batch Edit';
$lang->branch->defaultBranch = 'Default Branch';
$lang->branch->setDefault = 'Set Default';
$lang->branch->setDefaultAction = 'Set Default';
$lang->branch->mergeTo = 'Merge branch to';
$lang->branch->mergeBranch = 'Merge branch';
$lang->branch->edit = 'Edit %s';
$lang->branch->editAction = 'Edit Branch';
$lang->branch->activate = 'Activate';
$lang->branch->activateAction = 'Activate Branch';
$lang->branch->close = 'Close';
$lang->branch->closeAction = 'Close Branch';
$lang->branch->create = 'Create %s';
$lang->branch->createAction = 'Create Branch';
$lang->branch->merge = 'Merge';
$lang->branch->batchEdit = 'Batch Edit';
$lang->branch->defaultBranch = 'Default Branch';
$lang->branch->setDefault = 'Set Default';
$lang->branch->setDefaultAction = 'Set Default';
$lang->branch->mergeTo = 'Merge branch to';
$lang->branch->mergeBranch = 'Merge branch';
$lang->branch->mergeBranchAction = 'Merge branch';
$lang->branch->id = 'ID';
$lang->branch->product = 'Product';
module/branch/lang/zh-cn.php
+16 -15
View File
@@ -9,21 +9,22 @@ $lang->branch->manageTitle = '%s管理';
$lang->branch->all = '所有';
$lang->branch->main = '主干';
$lang->branch->edit = '编辑%s';
$lang->branch->editAction = '编辑分支';
$lang->branch->activate = '激活';
$lang->branch->activateAction = '激活分支';
$lang->branch->close = '关闭';
$lang->branch->closeAction = '关闭分支';
$lang->branch->create = '新建%s';
$lang->branch->createAction = '新建分支';
$lang->branch->merge = '合并';
$lang->branch->batchEdit = '批量编辑';
$lang->branch->defaultBranch = '默认分支';
$lang->branch->setDefault = '设为默认分支';
$lang->branch->setDefaultAction = '设置默认分支';
$lang->branch->mergeTo = '合并@branch@到';
$lang->branch->mergeBranch = '合并@branch@';
$lang->branch->edit = '编辑%s';
$lang->branch->editAction = '编辑分支';
$lang->branch->activate = '激活';
$lang->branch->activateAction = '激活分支';
$lang->branch->close = '关闭';
$lang->branch->closeAction = '关闭分支';
$lang->branch->create = '新建%s';
$lang->branch->createAction = '新建分支';
$lang->branch->merge = '合并';
$lang->branch->batchEdit = '批量编辑';
$lang->branch->defaultBranch = '默认分支';
$lang->branch->setDefault = '设为默认分支';
$lang->branch->setDefaultAction = '设置默认分支';
$lang->branch->mergeTo = '合并@branch@到';
$lang->branch->mergeBranch = '合并@branch@';
$lang->branch->mergeBranchAction = '合并分支';
$lang->branch->id = 'ID';
$lang->branch->product = '所属产品';
module/group/lang/resource.php
+12 -9
View File
@@ -476,15 +476,16 @@ $lang->product->methodOrder[105] = 'unbindWhitelist';
/* Branch. */
$lang->resource->branch = new stdclass();
$lang->resource->branch->manage = 'manage';
$lang->resource->branch->create = 'createAction';
$lang->resource->branch->edit = 'editAction';
$lang->resource->branch->close = 'closeAction';
$lang->resource->branch->activate = 'activateAction';
$lang->resource->branch->sort = 'sort';
$lang->resource->branch->delete = 'delete';
$lang->resource->branch->batchEdit = 'batchEdit';
$lang->resource->branch->setDefault = 'setDefaultAction';
$lang->resource->branch->manage = 'manage';
$lang->resource->branch->create = 'createAction';
$lang->resource->branch->edit = 'editAction';
$lang->resource->branch->close = 'closeAction';
$lang->resource->branch->activate = 'activateAction';
$lang->resource->branch->sort = 'sort';
$lang->resource->branch->delete = 'delete';
$lang->resource->branch->batchEdit = 'batchEdit';
$lang->resource->branch->setDefault = 'setDefaultAction';
$lang->resource->branch->mergeBranch = 'mergeBranchAction';
$lang->branch->methodOrder[0] = 'manage';
$lang->branch->methodOrder[5] = 'create';
@@ -494,6 +495,8 @@ $lang->branch->methodOrder[20] = 'activate';
$lang->branch->methodOrder[25] = 'sort';
$lang->branch->methodOrder[30] = 'delete';
$lang->branch->methodOrder[35] = 'batchEdit';
$lang->branch->methodOrder[40] = 'setDefault';
$lang->branch->methodOrder[45] = 'mergeBranch';
/* Story. */
$lang->resource->story = new stdclass();
module/product/control.php
+2 -2
View File
@@ -134,7 +134,8 @@ class product extends control
public function browse($productID = 0, $branch = '', $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1, $projectID = 0)
{
$productID = $this->app->tab != 'project' ? $this->product->saveState($productID, $this->products) : $productID;
$branch = ($this->cookie->preBranch !== '' and $branch === '') ? $this->cookie->preBranch : $branch;
$branches = $this->loadModel('branch')->getList($productID, $projectID, 'all');
$branch = ($this->cookie->preBranch !== '' and $branch === '' and isset($branches[$this->cookie->preBranch])) ? $this->cookie->preBranch : $branch;
$branchID = $branch;
/* Set menu. */
@@ -244,7 +245,6 @@ class product extends control
}
/* Display status of branch. */
$branches = $this->loadModel('branch')->getList($productID, $projectID, 'all');
$branchOption = array();
$branchTagOption = array();
foreach($branches as $branchInfo)