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

* Finish task #11267.

Browse Source
This commit is contained in:
holan20180123
2021-03-11 14:22:04 +08:00
parent ce96880223
commit ae00791f4e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+3 -3
View File
@@ -2276,9 +2276,9 @@ class executionModel extends model
extract($data); extract($data);
$executionType = $execution->type; $executionType = $execution->type;
$accounts = array_unique($accounts); $accounts = array_unique($accounts);
$limited = array_values($limited); $limited = array_values($limited);
$oldJoin = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq((int)$executionID)->andWhere('type')->eq($executionType)->fetchPairs(); $oldJoin = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq((int)$executionID)->andWhere('type')->eq($executionType)->fetchPairs();
$this->dao->delete()->from(TABLE_TEAM)->where('root')->eq((int)$executionID)->andWhere('type')->eq($executionType)->exec(); $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq((int)$executionID)->andWhere('type')->eq($executionType)->exec();
$executionMember = array(); $executionMember = array();
module/project/control.php
+1 -1
View File
@@ -795,7 +795,7 @@ class project extends control
if(!empty($_POST)) if(!empty($_POST))
{ {
$this->project->manageMembers($projectID); $this->execution->manageMembers($projectID);
$link = $this->createLink('project', 'manageMembers', "projectID=$projectID"); $link = $this->createLink('project', 'manageMembers', "projectID=$projectID");
$this->send(array('message' => $this->lang->saveSuccess, 'result' => 'success', 'locate' => $link)); $this->send(array('message' => $this->lang->saveSuccess, 'result' => 'success', 'locate' => $link));
} }
module/project/view/managemembers.html.php
+1 -1
View File
@@ -72,7 +72,7 @@
<td><input type='text' name='roles[]' id='role<?php echo ($i);?>' class='form-control' /></td> <td><input type='text' name='roles[]' id='role<?php echo ($i);?>' class='form-control' /></td>
<td><input type='text' name='days[]' id='days<?php echo ($i);?>' class='form-control' value='<?php echo $project->days?>'/></td> <td><input type='text' name='days[]' id='days<?php echo ($i);?>' class='form-control' value='<?php echo $project->days?>'/></td>
<td> <td>
<input type='text' name='hours[]' id='hours<?php echo ($i);?>' class='form-control' value='<?php echo $config->project->defaultWorkhours?>' /> <input type='text' name='hours[]' id='hours<?php echo ($i);?>' class='form-control' value='<?php echo $config->execution->defaultWorkhours?>' />
</td> </td>
<td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td> <td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td>
<td class='c-actions text-center'> <td class='c-actions text-center'>