Commit: 110e32d6271a63374f32abae1873c471ce8d8a89 - allura (git)

allura

Commit MetaInfo

• Revision: 110e32d6271a63374f32abae1873c471ce8d8a89 (tree)
• Zeit: 2012-07-17 23:09:50
• Autor: Dave Brondsema <dbrondsema@geek...>
• Commiter: Jenny Steele

Log Message

[#4551] don't force show_right_bar to True (True is the default anyway)

Ändern Zusammenfassung

• modified: Allura/allura/tests/functional/test_neighborhood.py
• modified: ForgeWiki/forgewiki/wiki_main.py

Diff

--- a/Allura/allura/tests/functional/test_neighborhood.py
+++ b/Allura/allura/tests/functional/test_neighborhood.py
@@ -506,6 +506,7 @@ class TestNeighborhood(TestController):
                         "mount_point":"wiki",
                         "options":{
                             "show_right_bar":false,
+                            "show_left_bar":false,
                             "show_discussion":false,
                             "some_url": "http://foo.com/$shortname/"
                         },
@@ -568,6 +569,8 @@ class TestNeighborhood(TestController):
         # check tool options
         opts = p.app_config('wiki').options
         assert_equal(False, opts.show_discussion)
+        assert_equal(False, opts.show_left_bar)
+        assert_equal(False, opts.show_right_bar)
         assert_equal("http://foo.com/testtemp/", opts.some_url)
         # check that custom groups/perms/users were setup correctly
         roles = p.named_roles

--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -182,7 +182,6 @@ class ForgeWikiApp(Application):
     def install(self, project):
         'Set up any default permissions and roles here'
         self.config.options['project_name'] = project.name
-        self.config.options['show_right_bar'] = True
         super(ForgeWikiApp, self).install(project)
         # Setup permissions
         role_admin = M.ProjectRole.by_name('Admin')._id