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

Merge branch 'sprint/169_tanghucheng_43619' into 'sprint/169'

Browse Source 
Finish task #43619,63620

See merge request easycorp/zentaopms!220
This commit is contained in:
孙广明
2021-10-29 02:28:44 +00:00
parent 07d6f3e27e 162846d43f
commit f1fbcdf74e
9 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/productplan/js/browse.js
+9 -1
View File
@@ -24,7 +24,15 @@ $(function()
{
var projectID = $('#project').val();
var planID = $('#planID').val();
$.apps.open(createLink('execution', 'create', 'projectID=' + projectID + '&executionID=&copyExecutionID=&planID=' + planID + '&confirm=&productID=' + productID), 'project')
if(!projectID)
{
alert(projectNotEmpty);
return false;
}
else
{
$.apps.open(createLink('execution', 'create', 'projectID=' + projectID + '&executionID=&copyExecutionID=&planID=' + planID + '&confirm=&productID=' + productID), 'project')
}
});
});
$(document).on('click', 'td.content .more', function(e)
module/productplan/lang/de.php
+1
View File
@@ -46,6 +46,7 @@ $lang->productplan->confirmUnlinkBug = "Möchten Sie diesen Bug löschen?";
$lang->productplan->noPlan = 'Kein Plan. ';
$lang->productplan->cannotDeleteParent = 'Cannot delete parent plan';
$lang->productplan->selectProjects = "Please select the project";
$lang->productplan->projectNotEmpty = 'Project cannot be empty.';
$lang->productplan->nextStep = "Next step";
$lang->productplan->id = 'ID';
module/productplan/lang/en.php
+1
View File
@@ -46,6 +46,7 @@ $lang->productplan->confirmUnlinkBug = "Do you want to unlink this bug?";
$lang->productplan->noPlan = 'No plans yet. ';
$lang->productplan->cannotDeleteParent = 'Cannot delete parent plan';
$lang->productplan->selectProjects = "Please select the project";
$lang->productplan->projectNotEmpty = 'Project cannot be empty.';
$lang->productplan->nextStep = "Next step";
$lang->productplan->id = 'ID';
module/productplan/lang/fr.php
+1
View File
@@ -46,6 +46,7 @@ $lang->productplan->confirmUnlinkBug = "Voulez-vous retirer ce bug du plan ?";
$lang->productplan->noPlan = "Aucun plan pour l'instant. ";
$lang->productplan->cannotDeleteParent = 'Impossible de supprimer le plan parent';
$lang->productplan->selectProjects = "Please select the project";
$lang->productplan->projectNotEmpty = 'Project cannot be empty.';
$lang->productplan->nextStep = "Next step";
$lang->productplan->id = 'ID';
module/productplan/lang/vi.php
+1
View File
@@ -46,6 +46,7 @@ $lang->productplan->confirmUnlinkBug = "Bạn có muốn hủy liên kết bug
$lang->productplan->noPlan = 'Không có kế hoạch nào';
$lang->productplan->cannotDeleteParent = 'Không thể xóa kế hoạch mẹ';
$lang->productplan->selectProjects = "Please select the project";
$lang->productplan->projectNotEmpty = 'Project cannot be empty.';
$lang->productplan->nextStep = "Next step";
$lang->productplan->id = 'ID';
module/productplan/lang/zh-cn.php
+1
View File
@@ -46,6 +46,7 @@ $lang->productplan->confirmUnlinkBug = "您确认移除该Bug吗？";
$lang->productplan->noPlan = "暂时没有计划。";
$lang->productplan->cannotDeleteParent = "不能删除父计划";
$lang->productplan->selectProjects = "请选择所属项目";
$lang->productplan->projectNotEmpty = '所属项目不能为空。';
$lang->productplan->nextStep = "下一步";
$lang->productplan->id = '编号';
module/productplan/lang/zh-tw.php
+1
View File
@@ -46,6 +46,7 @@ $lang->productplan->confirmUnlinkBug = "您確認移除該Bug嗎？";
$lang->productplan->noPlan = "暫時沒有計劃。";
$lang->productplan->cannotDeleteParent = "不能刪除父計劃";
$lang->productplan->selectProjects = "請選擇所屬項目";
$lang->productplan->projectNotEmpty = '所屬項目不能為空。';
$lang->productplan->nextStep = "下一步";
$lang->productplan->id = '編號';
module/productplan/view/browse.html.php
+1
View File
@@ -202,4 +202,5 @@
</div>
</div>
</div>
<?php js::set('projectNotEmpty', $lang->productplan->projectNotEmpty)?>
<?php include '../../common/view/footer.html.php';?>
module/todo/model.php
+2 -1
View File
@@ -515,7 +515,8 @@ class todoModel extends model
$stmt = $this->dao->select('*')->from(TABLE_TODO)
->where('deleted')->eq('0')
->andWhere('assignedTo', true)->eq($account)
->beginIF($type == 'assignedtoother')->andWhere('account', true)->eq($account)->fi()
->beginIF($type != 'assignedtoother')->andWhere('assignedTo', true)->eq($account)->fi()
->orWhere('finishedBy')->eq($account)
->markRight(1)
->beginIF($begin)->andWhere('date')->ge($begin)->fi()