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

Merge branch 'master' into 'sprint/206_liumengyi_58288'

Browse Source 
# Conflicts:
#   db/update17.1.sql
This commit is contained in:
王怡栋
2022-06-23 01:46:35 +00:00
parent 413248e27d 735bc3dc09
commit 77d1ab4daf
194 changed files with 2116 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+2 -2
View File
@@ -2924,8 +2924,8 @@ class execution extends control
if(!empty($_POST))
{
$this->execution->linkStory($objectID, array(), array(), $extra);
if($object->type != 'project' and $object->project != 0) $this->execution->linkStory($object->project);
$this->execution->linkStory($objectID, array(), array(), $extra);
if(isonlybody())
{
@@ -3232,7 +3232,7 @@ class execution extends control
$users = $this->loadModel('user')->getPairs('nodeleted|noclosed');
$members = $this->user->getTeamMemberPairs($objectID, $type);
return print(html::select('teamMembers[]', $users, array_keys($members), "class='form-control chosen' multiple"));
return print(html::select('teamMembers[]', $users, array_keys($members), "class='form-control picker-select' multiple"));
}
/**