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

Merge branch 'sprint/217_zg' into 'master'

Browse Source 
* Finish task#61184,61183,61172

See merge request easycorp/zentaopms!4593
This commit is contained in:
王怡栋
2022-07-19 01:52:12 +00:00
parent 201ce8c66a 773400bb27
commit 5a951491fe
2 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/js/managemember.js
+26
View File
@@ -5,4 +5,30 @@ $(function()
var checked = $(this).prop('checked');
$(this).parents('tr').find('input[type=checkbox]').prop('checked', checked);
});
$('#other,#group,#outside').selectable(
{
selector: 'input',
listenClick: false,
select: function(e)
{
$('[data-id=' + e.id + ']').prop('checked', true);
var checked = true;
var memberNum = $('[data-id=' + e.id + ']').closest('td').find('input').length;
var checkedMemberNum = $('[data-id=' + e.id + ']').closest('td').find('input:checked').length;
if(memberNum > checkedMemberNum) checked = false;
$('[data-id=' + e.id + ']').closest('tr').find('.check-all input').prop('checked', checked);
},
unselect: function(e)
{
$('[data-id=' + e.id + ']').prop('checked', false);
var checked = true;
var memberNum = $('[data-id=' + e.id + ']').closest('td').find('input').length;
var checkedMemberNum = $('[data-id=' + e.id + ']').closest('td').find('input:checked').length;
if(memberNum > checkedMemberNum) checked = false;
$('[data-id=' + e.id + ']').closest('tr').find('.check-all input').prop('checked', checked);
}
});
});
module/productplan/control.php
+16 -2
View File
@@ -393,8 +393,22 @@ class productplan extends control
return print(js::error($this->lang->notFound) . js::locate($this->createLink('product', 'index')));
}
$this->session->set('storyList', $this->createLink('productplan', 'view', "planID=$planID&type=story"), 'product');
$this->session->set('bugList', $this->createLink('productplan', 'view', "planID=$planID&type=bug"), 'qa');
if($type == 'story' and ($orderBy != 'order_desc' or $pageID != 1 or $recPerPage != 100))
{
$this->session->set('storyList', $this->app->getURI(true), 'product');
}
else
{
$this->session->set('storyList', $this->createLink('productplan', 'view', "planID=$planID&type=story"), 'product');
}
if($type == 'bug' and ($orderBy != 'order_desc' or $pageID != 1 or $recPerPage != 100))
{
$this->session->set('bugList', $this->app->getURI(true), 'qa');
}
else
{
$this->session->set('bugList', $this->createLink('productplan', 'view', "planID=$planID&type=bug"), 'qa');
}
/* Determines whether an object is editable. */
$canBeChanged = common::canBeChanged('plan', $plan);