matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove usage of extra_columns_preffixed, used only once, replaced. Issue #56

Browse Source
This commit is contained in:
Roberto Rosario
2015-01-24 02:45:44 -04:00
parent 139087ddbe
commit 8b02f8cb0c
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mayan/apps/document_indexing/views.py
View File

@@ -344,7 +344,7 @@ def index_instance_node_view(request, index_instance_node_pk):
return render_to_response('main/generic_list.html', { return render_to_response('main/generic_list.html', {
'object_list': index_instance_list, 'object_list': index_instance_list,
'extra_columns_preffixed': [ 'extra_columns': [
{ {
'name': _('Node'), 'name': _('Node'),
'attribute': encapsulate(lambda x: index_instance_item_link(x)) 'attribute': encapsulate(lambda x: index_instance_item_link(x))

15
mayan/apps/main/templates/main/generic_list_subtemplate.html
View File

@@ -58,10 +58,6 @@
<th>{% trans 'Identifier' %}</th> <th>{% trans 'Identifier' %}</th>
{% endif %} {% endif %}
{% for column in extra_columns_preffixed %}
<th>{{ column.name }}</th>
{% endfor %}
{% for column in object_list.0|get_model_list_columns %} {% for column in object_list.0|get_model_list_columns %}
<th>{{ column.name }}</th> <th>{{ column.name }}</th>
{% endfor %} {% endfor %}
@@ -96,16 +92,7 @@
<td>{% if not hide_link %}<a href="{{ object.get_absolute_url }}">{{ object }}</a>{% else %}{{ object }}{% endif %}</td> <td>{% if not hide_link %}<a href="{{ object.get_absolute_url }}">{{ object }}</a>{% else %}{{ object }}{% endif %}</td>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% for column in extra_columns_preffixed %} {% if not hide_columns %}
{% if column.keep_together %}
<td>
{{ object|object_property:column.attribute|make_non_breakable }}
</td>
{% else %}
<td>{{ object|object_property:column.attribute }}</td>
{% endif %}
{% endfor %}
{% if not hide_columns %}
{% for column in object|get_model_list_columns %} {% for column in object|get_model_list_columns %}
<td>{{ object|object_property:column.attribute }}</td> <td>{{ object|object_property:column.attribute }}</td>
{% endfor %} {% endfor %}