Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-14 23:10:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'issue_1234_exiom' into 'master'

Browse Source 
Month Ordering Fix for Group Management Audit Logs

See merge request allianceauth/allianceauth!1245
This commit is contained in:
Ariel Rin 2020-08-25 06:07:45 +00:00
commit 7dcfa622a3
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
allianceauth/groupmanagement/templates/groupmanagement/audit.html
View File

@ -33,7 +33,7 @@
<tbody> <tbody>
{% for entry in entries %} {% for entry in entries %}
<tr> <tr>
<td class="text-center">{{ entry.date|date:"Y-m-d H:i" }}</td> <td class="text-center">{{ entry.date|date:"Y-M-d, H:i" }}</td>
<td class="text-center">{{ entry.requestor }}</td> <td class="text-center">{{ entry.requestor }}</td>
<td class="text-center">{{ entry.req_char }}</td> <td class="text-center">{{ entry.req_char }}</td>
<td class="text-center">{{ entry.req_char.corporation_name }}</td> <td class="text-center">{{ entry.req_char.corporation_name }}</td>
@ -66,6 +66,7 @@
{% block extra_javascript %} {% block extra_javascript %}
{% include 'bundles/datatables-js.html' %} {% include 'bundles/datatables-js.html' %}
{% include 'bundles/moment-js.html' %}
<script type="text/javascript" src="{% static 'js/filterDropDown/filterDropDown.min.js' %}"></script> <script type="text/javascript" src="{% static 'js/filterDropDown/filterDropDown.min.js' %}"></script>
{% endblock %} {% endblock %}
@ -74,7 +75,26 @@
{% endblock %} {% endblock %}
{% block extra_script %} {% block extra_script %}
$.fn.dataTable.moment = function ( format, locale ) {
var types = $.fn.dataTable.ext.type;
// Add type detection
types.detect.unshift( function ( d ) {
return moment( d, format, locale, true ).isValid() ?
'moment-'+format :
null;
} );
// Add sorting method - use an integer for the sorting
types.order[ 'moment-'+format+'-pre' ] = function ( d ) {
return moment( d, format, locale, true ).unix();
};
};
$(document).ready(function(){ $(document).ready(function(){
$.fn.dataTable.moment( 'YYYY-MMM-D, HH:mm' );
$('#log-entries').DataTable({ $('#log-entries').DataTable({
order: [[ 0, 'desc' ], [ 1, 'asc' ] ], order: [[ 0, 'desc' ], [ 1, 'asc' ] ],
filterDropDown: filterDropDown: