Browse Source

[core] Fix config alert dock

Romain Rigaux 12 years ago
parent
commit
8a320db

+ 3 - 3
apps/about/src/about/templates/admin_wizard.mako

@@ -52,7 +52,7 @@ ${ commonheader(_('About Hue'), "quick_start", user, "100px") | n,unicode }
       <li class="active"><a href="#step1" class="step">${ _('Step 1: Check Configuration') }</a></li>
       <li><a href="#step2" class="step">${ _('Step 2: Examples') }</a></li>
       <li><a href="#step3" class="step">${ _('Step 3: Users') }</a></li>
-      <li><a href="/beeswax" class="step">${ _('Step 4: Use Hue') }</a></li>
+      <li><a href="${ url('desktop.views.home') }" class="step">${ _('Step 4: Use Hue') }</a></li>
     </ul>
 
     <div class="steps" >
@@ -72,10 +72,10 @@ ${ commonheader(_('About Hue'), "quick_start", user, "100px") | n,unicode }
             </button>
           </li>
         % endif
-        % if 'oozie' in app_names:
+        % if 'oozie' in app_names or 'jobsub' in app_names:
           <li>
             <button type="button" class="btn" data-loading-text="Installing..." data-url="${ url('oozie:setup_app') }">
-              <i class="icon-download-alt"></i> Oozie
+              <i class="icon-download-alt"></i> Oozie / Job Designer
             </button>
           </li>
         % endif

+ 1 - 1
desktop/core/src/desktop/templates/config_alert_dock.mako

@@ -17,7 +17,7 @@
 from django.utils.translation import ugettext as _
 %>
 % if error_list:
-  <a href="${url('about.views.index')}" title="${_('Misconfiguration detected')}" alt="${_('Misconfiguration detected')}">
+  <a href="${url('about:index')}" title="${_('Misconfiguration detected')}" alt="${_('Misconfiguration detected')}">
     <img src="/static/art/error.png"/>
   </a>
 % endif

+ 7 - 0
desktop/core/src/desktop/tests.py

@@ -38,6 +38,7 @@ from desktop.lib.conf import validate_path
 from desktop.lib.django_util import TruncatingModel
 from desktop.lib.exceptions_renderable import PopupException
 from desktop.lib.test_utils import grant_access
+from desktop.views import check_config_ajax
 
 
 def setup_test_environment():
@@ -449,3 +450,9 @@ def test_ui_customizations():
   finally:
     for old_conf in reset:
       old_conf()
+
+
+def test_check_config_ajax():
+  c = make_logged_in_client()
+  response = c.get(reverse(check_config_ajax))
+  assert_true("Misconfiguration" in response.content, response.content)