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

* Finish task #43898.

Browse Source
This commit is contained in:
hufangzhou
2021-11-09 17:16:30 +08:00
parent d889184204
commit 9f77cc6fb6
8 changed files with 98 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+6 -4
View File
@@ -279,6 +279,7 @@ $lang->action->label->reviewrejected = 'Reject';
$lang->action->label->reviewclarified = 'Clarify';
$lang->action->label->commitsummary = 'Commit Summary';
$lang->action->label->updatetrainee = 'Update Trainee';
$lang->action->label->setdefaultbranch = 'Set default branch';
/* Dynamic information is grouped by object. */
$lang->action->dynamicAction = new stdclass;
@@ -312,10 +313,11 @@ $lang->action->dynamicAction->product['closed'] = 'Close ' . $lang->productCo
$lang->action->dynamicAction->product['undeleted'] = 'Restore ' . $lang->productCommon;
$lang->action->dynamicAction->product['hidden'] = 'Hide ' . $lang->productCommon;
$lang->action->dynamicAction->branch['opened'] = 'Create Branch';
$lang->action->dynamicAction->branch['edited'] = 'Edit Branch';
$lang->action->dynamicAction->branch['closed'] = 'Close Branch';
$lang->action->dynamicAction->branch['activated'] = 'Activate Branch';
$lang->action->dynamicAction->branch['opened'] = 'Create Branch';
$lang->action->dynamicAction->branch['edited'] = 'Edit Branch';
$lang->action->dynamicAction->branch['closed'] = 'Close Branch';
$lang->action->dynamicAction->branch['activated'] = 'Activate Branch';
$lang->action->dynamicAction->branch['setdefaultbranch'] = 'Set Default Branch';
$lang->action->dynamicAction->productplan['opened'] = 'Create Plan';
$lang->action->dynamicAction->productplan['edited'] = 'Edit Plan';
module/action/lang/zh-cn.php
+6 -4
View File
@@ -279,6 +279,7 @@ $lang->action->label->reviewrejected = '拒绝';
$lang->action->label->reviewclarified = '有待明确';
$lang->action->label->commitsummary = '提交培训总结';
$lang->action->label->updatetrainee = '更新培训人员';
$lang->action->label->setdefaultbranch = '设置了默认分支';
/* 动态信息按照对象分组 */
$lang->action->dynamicAction = new stdclass();
@@ -312,10 +313,11 @@ $lang->action->dynamicAction->product['closed'] = '关闭' . $lang->productCo
$lang->action->dynamicAction->product['undeleted'] = '还原' . $lang->productCommon;
$lang->action->dynamicAction->product['hidden'] = '隐藏' . $lang->productCommon;
$lang->action->dynamicAction->branch['opened'] = '创建分支';
$lang->action->dynamicAction->branch['edited'] = '编辑分支';
$lang->action->dynamicAction->branch['closed'] = '关闭分支';
$lang->action->dynamicAction->branch['activated'] = '激活分支';
$lang->action->dynamicAction->branch['opened'] = '创建分支';
$lang->action->dynamicAction->branch['edited'] = '编辑分支';
$lang->action->dynamicAction->branch['closed'] = '关闭分支';
$lang->action->dynamicAction->branch['activated'] = '激活分支';
$lang->action->dynamicAction->branch['setdefaultbranch'] = '设置默认分支';
$lang->action->dynamicAction->productplan['opened'] = "创建计划";
$lang->action->dynamicAction->productplan['edited'] = "编辑计划";
module/branch/control.php
+25
View File
@@ -254,4 +254,29 @@ class branch extends control
if($oldBranch) $branches = array($oldBranch => $branches[$oldBranch]);
die(html::select('branch', $branches, '', "class='form-control' onchange='loadBranch(this)'"));
}
/**
* Set default branch.
*
* @param int $productID
* @param int $branchID
* @param string $confirm yes|no
* @access public
* @return void
*/
public function setDefault($productID, $branchID, $confirm = 'no')
{
if($confirm == 'no')
{
$this->app->loadLang('product');
$productType = $this->branch->getProductType($branchID);
die(js::confirm(str_replace('@branch@', $this->lang->product->branchName[$productType], $this->lang->branch->confirmSetDefault), inlink('setDefault', "productID=$productID&branchID=$branchID&confirm=yes")));
}
$this->branch->setDefault($productID, $branchID);
$this->loadModel('action')->create('branch', $branchID, 'SetDefaultBranch');
die(js::reload('parent'));
}
}
module/branch/js/manage.js
+8
View File
@@ -25,4 +25,12 @@ $(function()
$.post(createLink('branch', 'sort'), {'branches' : list});
}
});
$('td.c-name.flex').mouseenter(function()
{
$(this).find('.setDefault').removeClass('hidden');
}).mouseleave(function()
{
$(this).find('.setDefault').addClass('hidden');
})
});
module/branch/lang/en.php
+8 -5
View File
@@ -19,6 +19,7 @@ $lang->branch->create = 'Create Branch';
$lang->branch->merge = 'Merge';
$lang->branch->batchEdit = 'Batch Edit';
$lang->branch->defaultBranch = 'Default Branch';
$lang->branch->setDefault = 'Set Default';
$lang->branch->id = 'ID';
$lang->branch->product = 'Product';
@@ -30,12 +31,14 @@ $lang->branch->desc = 'Desc';
$lang->branch->order = 'Order';
$lang->branch->deleted = 'Delete';
$lang->branch->closed = 'Closed';
$lang->branch->default = 'Default';
$lang->branch->confirmDelete = 'Do you want to delete this @branch@?';
$lang->branch->canNotDelete = 'There is data in @branch@. It cannot be deleted.';
$lang->branch->nameNotEmpty = 'Name must not be empty！';
$lang->branch->confirmClose = 'Do you want to close this @branch@？';
$lang->branch->confirmActivate = 'Do you want to activate this @branch@？';
$lang->branch->confirmDelete = 'Do you want to delete this @branch@?';
$lang->branch->confirmSetDefault = 'Do you want to set @branch@ as default @branch@? After your setting, the default @branch@ will be selected and shown in its Plan/Release list.';
$lang->branch->canNotDelete = 'There is data in @branch@. It cannot be deleted.';
$lang->branch->nameNotEmpty = 'Name must not be empty！';
$lang->branch->confirmClose = 'Do you want to close this @branch@？';
$lang->branch->confirmActivate = 'Do you want to activate this @branch@？';
$lang->branch->noData = 'No branches.';
$lang->branch->mainBranch = 'The default main branch of the product.';
module/branch/lang/zh-cn.php
+8 -5
View File
@@ -19,6 +19,7 @@ $lang->branch->create = '新增分支';
$lang->branch->merge = '合并';
$lang->branch->batchEdit = '批量编辑';
$lang->branch->defaultBranch = '默认分支';
$lang->branch->setDefault = '设为默认分支';
$lang->branch->id = 'ID';
$lang->branch->product = '所属产品';
@@ -30,12 +31,14 @@ $lang->branch->desc = '分支描述';
$lang->branch->order = '排序';
$lang->branch->deleted = '已删除';
$lang->branch->closed = '已关闭';
$lang->branch->default = '默认';
$lang->branch->confirmDelete = '是否删除该@branch@？';
$lang->branch->canNotDelete = '该@branch@下已经有数据，不能删除！';
$lang->branch->nameNotEmpty = '名称不能为空！';
$lang->branch->confirmClose = '是否关闭该@branch@？';
$lang->branch->confirmActivate = '是否激活该@branch@？';
$lang->branch->confirmDelete = '是否删除该@branch@？';
$lang->branch->confirmSetDefault = '请确认是否需要将该@branch@设置为默认@branch@，设置成功后计划和发布列表将默认选中默认@branch@。';
$lang->branch->canNotDelete = '该@branch@下已经有数据，不能删除！';
$lang->branch->nameNotEmpty = '名称不能为空！';
$lang->branch->confirmClose = '是否关闭该@branch@？';
$lang->branch->confirmActivate = '是否激活该@branch@？';
$lang->branch->noData = '暂时没有分支。';
$lang->branch->mainBranch = '产品默认主干分支。';
module/branch/model.php
+20
View File
@@ -393,4 +393,24 @@ class branchModel extends model
$linkHtml = strpos('programplan', $module) !== false ? sprintf($link, $projectID, $productID, $branch) : sprintf($link, $productID, $branch);
return $linkHtml;
}
/**
* Set default branch.
*
* @param int $productID
* @param int $branchID
* @accesss public
* @return void
*/
public function setDefault($productID, $branchID)
{
$defaultBranch = $this->dao->select('id')->from(TABLE_BRANCH)
->where('product')->eq($productID)
->andWhere('`default`')->eq('1')
->fetch('id');
$this->dao->update(TABLE_BRANCH)->set('`default`')->eq('1')->where('id')->eq($branchID)->exec();
if(!empty($defaultBranch)) $this->dao->update(TABLE_BRANCH)->set('`default`')->eq('0')->where('id')->eq($defaultBranch)->exec();
}
}
module/branch/view/manage.html.php
+17 -1
View File
@@ -67,7 +67,23 @@
</td>
<?php endif;?>
<td class='c-actions sort-handler'><i class="icon icon-move"></i></td>
<td class='c-name' title='<?php echo $branch->name;?>'><?php echo $branch->name;?></td>
<td class='c-name flex' title='<?php echo $branch->name;?>'>
<span class="text-ellipsis"><?php echo $branch->name;?></span>
<?php
if($branch->default)
{
echo '<span class="label label-primary">' . $lang->branch->default . '</span>';
}
else
{
$setDefaultLink = helper::createLink('branch', 'setDefault', "productID=$productID&branchID=$branch->id", '', true);
$setDefaultHtml = html::a($setDefaultLink, "<i class='icon icon-hand-right'></i> <span>{$lang->branch->setDefault}</span>", '', "class='iframe btn btn-icon-left btn-sm setDefault hidden'");
echo common::hasPriv('branch', 'setDefault') ? $setDefaultHtml : '';
}
?>
</td>
<td><?php echo zget($lang->branch->statusList, $branch->status);?></td>
<td><?php echo helper::isZeroDate($branch->createdDate) ? '' : $branch->createdDate;?></td>
<td><?php echo helper::isZeroDate($branch->closedDate) ? '' : $branch->closedDate;?></td>