Merge branch '2375-demo-theme-development' into 2618-nested-resources

ckan · Aug 16, 2012 · 3f54a4e · 3f54a4e
2 parents 15c0b86 + ef1b588
commit 3f54a4e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ckan/controllers/related.py b/ckan/controllers/related.py
@@ -10,6 +10,7 @@
 import urllib
 
 c = base.c
+abort = base.abort
 _get_action=logic.get_action
 
 

diff --git a/ckan/templates/user/read.html b/ckan/templates/user/read.html
@@ -12,8 +12,9 @@
 {% endblock %}
 
 {% block actions_content %}
-  {% if c.is_myself %}
-    <li>{% link_for _('Dashboard'), controller='user', action='dashboard', class_='btn', icon='dashboard' %}</li>
+{% if c.is_myself %}
+{# FIXME dashboard disabled #}
+  {#    <li>{% link_for _('Dashboard'), controller='user', action='dashboard', class_='btn', icon='dashboard' %}</li>  #}
   {% endif %}
   {% if h.check_access('user_update', user) %}
     <li>{% link_for _('Edit'), controller='user', action='edit', id=user.name, class_='btn', icon='cog' %}</li>