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

Fixed diagnostics url resolution

Browse Source
This commit is contained in:
Roberto Rosario
2011-04-15 00:04:06 -04:00
parent eb5e53f5f0
commit e8b23b48a2
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/main/api.py
View File

@@ -1,8 +1,11 @@
from django.core.urlresolvers import reverse
diagnostics = {} diagnostics = {}
def register_diagnostic(namespace, title, link): def register_diagnostic(namespace, title, link):
namespace_dict = diagnostics.get(namespace, {'title': None, 'links': []}) namespace_dict = diagnostics.get(namespace, {'title': None, 'links': []})
namespace_dict['title'] = title namespace_dict['title'] = title
link['url'] = link.get('url', reverse(link['view']))
namespace_dict['links'].append(link) namespace_dict['links'].append(link)
diagnostics[namespace] = namespace_dict diagnostics[namespace] = namespace_dict

16
apps/navigation/templates/generic_navigation.html
View File

@@ -2,17 +2,17 @@
<span class="nowrap"> <span class="nowrap">
{% for link in object_navigation_links %} {% for link in object_navigation_links %}
{% if link.permissions %} {% if link.permissions %}
{% check_permissions request.user link.permissions.namespace link.permissions.permissions %} {% check_permissions request.user link.permissions.namespace link.permissions.permissions %}
{% if permission %} {% if permission %}
{% if as_li %}<li>{% endif %}
<a class="{{ link.class }}" href="{{ link.url }}">{% if link.famfam %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text|capfirst }}{% if link.error %} - {{ link.error }}{% endif %}{% if link.active %}<span class="famfam active famfam-resultset_previous"></span>{% endif %}</a>{% if horizontal %}{% if not forloop.last %} | {% endif %}{% endif %}
{% if as_li %}</li>{% endif %}
{% endif %}
{% else %}
{% if as_li %}<li>{% endif %} {% if as_li %}<li>{% endif %}
<a class="{{ link.class }}" href="{{ link.url }}">{% if link.famfam %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text|capfirst }}{% if link.error %} - {{ link.error }}{% endif %}{% if link.active %}<span class="famfam active famfam-resultset_previous"></span>{% endif %}</a>{% if horizontal %}{% if not forloop.last %} | {% endif %}{% endif %} <a class="{{ link.class }}" href="{{ link.url }}">{% if link.famfam %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text|capfirst }}{% if link.error %} - {{ link.error }}{% endif %}{% if link.active %}<span class="famfam active famfam-resultset_previous"></span>{% endif %}</a>{% if horizontal %}{% if not forloop.last %} | {% endif %}{% endif %}
{% if as_li %}</li>{% endif %} {% if as_li %}</li>{% endif %}
{% endif %} {% endif %}
{% else %}
{% if as_li %}<li>{% endif %}
<a class="{{ link.class }}" href="{{ link.url }}">{% if link.famfam %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text|capfirst }}{% if link.error %} - {{ link.error }}{% endif %}{% if link.active %}<span class="famfam active famfam-resultset_previous"></span>{% endif %}</a>{% if horizontal %}{% if not forloop.last %} | {% endif %}{% endif %}
{% if as_li %}</li>{% endif %}
{% endif %}
{% endfor %} {% endfor %}
</span> </span>