提交: 0fa9abd94a7eeeb2af4374bd4f549fd9965d1d76 - allura (git)

allura

Commit MetaInfo

• 修訂: 0fa9abd94a7eeeb2af4374bd4f549fd9965d1d76 (tree)
• 時間: 2012-05-24 20:46:41
• 作者: Igor Bondarenko <jetmind2@gmai...>
• Commiter: Igor Bondarenko

Log Message

[#4187] ticket:69 expand test and fix functionality

Change Summary

• modified: Allura/allura/templates/jinja_master/nav_menu.html
• modified: Allura/allura/tests/functional/test_neighborhood.py

差異

--- a/Allura/allura/templates/jinja_master/nav_menu.html
+++ b/Allura/allura/templates/jinja_master/nav_menu.html
@@ -1,5 +1,6 @@
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
-{% if not c.project or not c.project.neighborhood.show_title %}
+{% set n = c.project.neighborhood %}
+{% if not c.project or (n.neighborhood_project == c.project and not n.show_title) %}
   <div id="nav_menu_missing"></div>
 {% else %}
   {% if c.project.neighborhood.icon %}
@@ -22,4 +23,4 @@
       {% endif %}
 	</h1>
 	</a>
-{% endif %}
\ No newline at end of file
+{% endif %}

--- a/Allura/allura/tests/functional/test_neighborhood.py
+++ b/Allura/allura/tests/functional/test_neighborhood.py
@@ -75,11 +75,13 @@ class TestNeighborhood(TestController):
                                       tracking_id='U-123456',
                                       show_title='false'),
                           extra_environ=dict(username='root'))
-        r = self.app.get('/adobe/_admin/overview', extra_environ=dict(username='root'))
         # no title now
+        r = self.app.get('/adobe/', extra_environ=dict(username='root'))
         assert 'class="project_title"' not in str(r)
-        r = self.app.get('/adobe', extra_environ=dict(username='root'))
+        r = self.app.get('/adobe/wiki/Home/',
+                         extra_environ=dict(username='root'))
         assert 'class="project_title"' not in str(r)
+
         # title must be present on project page
         r = self.app.get('/adobe/adobe-1/admin/',
                          extra_environ=dict(username='root'))