Merge branch 'master' into develop
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
VERSION = (2, 0, 14)
|
||||
VERSION = (2, 0, 15)
|
||||
DEV_N = None
|
||||
|
||||
|
||||
|
||||
def get_version():
|
||||
version = '{0}.{1}'.format(VERSION[0], VERSION[1])
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
{
|
||||
// set icons based on position
|
||||
lineItems.each(function(index, element) {
|
||||
var icon = $(element).find('> a .fa');
|
||||
var icon = $(element).find('a.admin_sorting_url .fa');
|
||||
icon.removeClass('fa-sort-desc fa-sort-asc fa-sort');
|
||||
|
||||
if (index === 0) {
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
ui.item.parent().children('tr').each(function(i)
|
||||
{
|
||||
var index_value = $(this).find('.original :input:first').val();
|
||||
if (index_value !== '' && index_value !== undefined) {
|
||||
if (index_value !== '' && index_value !== undefined) {
|
||||
indexes.push(index_value);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
|
||||
<form>
|
||||
<input name="pk" type="hidden" value="{{ object.pk }}" />
|
||||
<a href="{% url 'admin:admin_do_sorting' object.model_type_id %}" class="admin_sorting_url"><i class="fa fa-{% if forloop.first %}sort-desc{% elif forloop.last %}sort-asc{% else %}sort{% endif %}"></i> {{ object }}</a>
|
||||
</form>
|
||||
<a href="{% url 'admin:admin_do_sorting' object.model_type_id %}" class="admin_sorting_url"><i class="fa fa-{% if forloop.first %}sort-desc{% elif forloop.last %}sort-asc{% else %}sort{% endif %}"></i> {{ object }}</a>
|
||||
|
||||
Reference in New Issue
Block a user