Briq
/
django-admin-sortable-fixwin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #150 from shjohnson-pi/master 

Fix missing icons in Django 1.9
master
Brandon Taylor 2016-07-09 18:16:30 -04:00 committed by GitHub
parent 4182468d2f f850e639c9
commit 3c7a012f5f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adminsortable/templates/adminsortable/edit_inline/tabular.html
View File

@ -11,7 +11,7 @@
{% for field in inline_admin_formset.fields %} {% for field in inline_admin_formset.fields %}
{% if not field.widget.is_hidden %} {% if not field.widget.is_hidden %}
<th{% if forloop.first %} colspan="2"{% endif %}{% if field.required %} class="required"{% endif %}>{{ field.label|capfirst }} <th{% if forloop.first %} colspan="2"{% endif %}{% if field.required %} class="required"{% endif %}>{{ field.label|capfirst }}
{% if field.help_text %}&nbsp;<img src="{% static "admin/img/icon-unknown.gif" %}" class="help help-tooltip" width="10" height="10" alt="({{ field.help_text|striptags }})" title="{{ field.help_text|striptags }}" />{% endif %} {% if field.help_text %}&nbsp;<img src="{% if django_version.major >= 1 and django_version.minor >= 9 %}{% static "admin/img/icon-unknown.svg" %}{% else %}{% static "admin/img/icon-unknown.gif" %}{% endif %}" class="help help-tooltip" width="10" height="10" alt="({{ field.help_text|striptags }})" title="{{ field.help_text|striptags }}" />{% endif %}
</th> </th>
{% endif %} {% endif %}
{% endfor %} {% endfor %}

8
sample_project/app/models.py
View File

@ -64,8 +64,8 @@ class Credit(SortableMixin):
ordering = ['order'] ordering = ['order']
project = models.ForeignKey(Project) project = models.ForeignKey(Project)
first_name = models.CharField(max_length=30) first_name = models.CharField(max_length=30, help_text="Given name")
last_name = models.CharField(max_length=30) last_name = models.CharField(max_length=30, help_text="Family name")
order = models.PositiveIntegerField(default=0, editable=False) order = models.PositiveIntegerField(default=0, editable=False)
@ -92,8 +92,8 @@ class Note(SortableMixin):
@python_2_unicode_compatible @python_2_unicode_compatible
class NonSortableCredit(models.Model): class NonSortableCredit(models.Model):
project = models.ForeignKey(Project) project = models.ForeignKey(Project)
first_name = models.CharField(max_length=30) first_name = models.CharField(max_length=30, help_text="Given name")
last_name = models.CharField(max_length=30) last_name = models.CharField(max_length=30, help_text="Family name")
def __str__(self): def __str__(self):
return '{0} {1}'.format(self.first_name, self.last_name) return '{0} {1}'.format(self.first_name, self.last_name)