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

This commit is contained in:
wangyidong
2015-11-13 13:27:57 +08:00
2 changed files with 21 additions and 20 deletions

View File

@@ -33,12 +33,12 @@ $(function()
function addItem()
{
var item = $('#addItem').html().replace(/%i%/g, i).replace(/%memberCount%/g, memberCount);
var item = $('#addItem').html().replace(/%i%/g, i);
$('#submit').before('<tr class="addedItem">' + item + '</tr>');
$('#accounts' + memberCount).trigger('liszt:updated');
$('#accounts' + memberCount).chosen(defaultChosenOptions);
var accounts = $('#submit').closest('table').find('tr.addedItem:last').find('select:first')
accounts.trigger('liszt:updated');
accounts.chosen(defaultChosenOptions);
i ++;
memberCount ++;
}
function deleteItem(obj)

View File

@@ -57,7 +57,7 @@
<?php foreach($members2Import as $member2Import):?>
<tr class='addedItem'>
<td><?php echo html::select("accounts[$memberCount]", $users, $member2Import->account, "class='select-2 chosen' onchange='setRole(this.value, $i)'");?></td>
<td><?php echo html::select("accounts[]", $users, $member2Import->account, "class='select-2 chosen' onchange='setRole(this.value, $i)'");?></td>
<td><input type='text' name='roles[]' id='role<?php echo $i;?>' class='form-control' value='<?php echo $member2Import->role;?>' /></td>
<td><input type='text' name='days[]' id='days<?php echo $i;?>' class='form-control' value='<?php echo $project->days?>'/></td>
<td>
@@ -72,7 +72,7 @@
<?php for($j = 0; $j < 5; $j ++):?>
<tr class='addedItem'>
<td><?php echo html::select("accounts[$memberCount]", $users, '', "class='select-2 chosen' onchange='setRole(this.value, $i)'");?></td>
<td><?php echo html::select("accounts[]", $users, '', "class='select-2 chosen' onchange='setRole(this.value, $i)'");?></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>
@@ -84,21 +84,8 @@
</tr>
<?php $i ++; $memberCount ++;?>
<?php endfor;?>
<?php js::set('i', $i);?>
<?php js::set('memberCount', $memberCount);?>
<?php $i = '%i%'; $memberCount = '%memberCount%';?>
<tr id='addItem' class='hidden'>
<td><?php echo html::select("accounts[$memberCount]", $users, '', "class='select-2' onchange='setRole(this.value, $i)'");?></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='hours[]' id='hours<?php echo ($i);?>' class='form-control' value='7' />
<input type='hidden' name='modes[]' value='create' />
</td>
<td><a href='javascript:;' onclick='addItem()' class='btn btn-block'><i class='icon-plus'></i></a></td>
<td><a href='javascript:;' onclick='deleteItem(this)' class='btn btn-block'><i class='icon icon-remove'></i></a></td>
</tr>
<tr id='submit'>
<td colspan='6' class='text-center'>
<?php echo html::submitButton() ?>
@@ -106,6 +93,20 @@
</tr>
</table>
</form>
<?php $i = '%i%';?>
<table class='hidden'>
<tr id='addItem' class='hidden'>
<td><?php echo html::select("accounts[]", $users, '', "class='select-2' onchange='setRole(this.value, $i)'");?></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='hours[]' id='hours<?php echo ($i);?>' class='form-control' value='7' />
<input type='hidden' name='modes[]' value='create' />
</td>
<td><a href='javascript:;' onclick='addItem()' class='btn btn-block'><i class='icon-plus'></i></a></td>
<td><a href='javascript:;' onclick='deleteItem(this)' class='btn btn-block'><i class='icon icon-remove'></i></a></td>
</tr>
</table>
</div>
<div class='modal fade' id='importTeamModal'>
<div class='modal-dialog mw-700px'>