Merge branch 'master' of github.com:easysoft/zentaopms

Conflicts:
	module/task/view/create.html.php
This commit is contained in:
wangyidong
2014-06-18 08:31:39 +00:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -85,7 +85,7 @@
</tr>
<tr>
<th><?php echo $lang->task->mailto;?></th>
<td colspan='2'><?php echo html::select('mailto[]', $members, str_replace(' ', '', $task->mailto), "multiple class='form-control'");?></td>
<td colspan='2'><?php echo html::select('mailto[]', $project->acl == 'private' ? $members : $users, str_replace(' ', '', $task->mailto), "multiple class='form-control'");?></td>
<td class='text-top'><?php if($contactLists) echo html::select('', $contactLists, '', "class='form-control' onchange=\"setMailto('mailto', this.value)\"");?></td>
</tr>
<tr>