merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -71,8 +71,8 @@ function completeGetTrashList(ret_obj, response_tags)
htmlListBuffer += '<tr>' +
'<td class="title">'+ title +'</td>' +
'<td>'+ objTrash.nickName +'</td>' +
'<td>'+ objTrash.ipaddress +'</td>' +
'<td class="nowr">'+ objTrash.nickName +'</td>' +
'<td class="nowr">'+ objTrash.ipaddress +'</td>' +
'</tr>' +
'<input type="hidden" name="cart[]" value="'+objTrash.trashSrl+'" />';
}