Merge branch 'develop' of https://github.com/snipe/snipe-it into develop

This commit is contained in:
snipe 2018-10-31 15:19:18 -07:00
commit ce8d47b2b4

View file

@ -108,13 +108,13 @@
<th>{{ trans('general.bulkaudit_status') }}</th> <th>{{ trans('general.bulkaudit_status') }}</th>
<th></th> <th></th>
</tr> </tr>
</thead>
<tbody>
<tr id="audit-loader" style="display: none;"> <tr id="audit-loader" style="display: none;">
<td colspan="3"> <td colspan="3">
<i class="fa fa-spinner spin" aria-hidden="true"></i> Processing... <i class="fa fa-spinner spin" aria-hidden="true"></i> Processing...
</td> </td>
</tr> </tr>
</thead>
<tbody>
</tbody> </tbody>
</table> </table>
</div> </div>
@ -150,7 +150,7 @@
data : formData, data : formData,
success : function (data) { success : function (data) {
if (data.status == 'success') { if (data.status == 'success') {
$('#audited tbody').append("<tr class='success'><td>" + data.payload.asset_tag + "</td><td>" + data.messages + "</td><td><i class='fa fa-check text-success'></i></td></tr>"); $('#audited tbody').prepend("<tr class='success'><td>" + data.payload.asset_tag + "</td><td>" + data.messages + "</td><td><i class='fa fa-check text-success'></i></td></tr>");
incrementOnSuccess(); incrementOnSuccess();
} else { } else {
handleAuditFail(data); handleAuditFail(data);
@ -180,7 +180,7 @@
} else { } else {
var messages = ''; var messages = '';
} }
$('#audited tbody').append("<tr class='danger'><td>" + asset_tag + "</td><td>" + messages + "</td><td><i class='fa fa-times text-danger'></i></td></tr>"); $('#audited tbody').prepend("<tr class='danger'><td>" + asset_tag + "</td><td>" + messages + "</td><td><i class='fa fa-times text-danger'></i></td></tr>");
} }
function incrementOnSuccess() { function incrementOnSuccess() {