Author: jure
Date: Fri Mar 29 14:18:02 2013
New Revision: 1462482
URL: http://svn.apache.org/r1462482
Log:
#406, populate default product with system wikis on setup
Modified:
bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/admin.py
bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/api.py
bloodhound/branches/bep_0003_multiproduct/installer/bloodhound_setup.py
Modified:
bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/admin.py
URL:
http://svn.apache.org/viewvc/bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/admin.py?rev=1462482&r1=1462481&r2=1462482&view=diff
==============================================================================
---
bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/admin.py
(original)
+++
bloodhound/branches/bep_0003_multiproduct/bloodhound_dashboard/bhdashboard/admin.py
Fri Mar 29 14:18:02 2013
@@ -91,11 +91,6 @@ class BloodhoundAdmin(Component):
"""Move all wiki pages starting with Trac prefix to unbranded user
guide pages.
"""
-
- # set global product scope on wiki pages
- with self.env.db_direct_transaction as db:
- db("UPDATE wiki SET product=''")
-
wiki_admin = WikiAdmin(self.env)
pages = wiki_admin.get_wiki_list()
for old_name in pages:
Modified:
bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/api.py
URL:
http://svn.apache.org/viewvc/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/api.py?rev=1462482&r1=1462481&r2=1462482&view=diff
==============================================================================
---
bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/api.py
(original)
+++
bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/api.py
Fri Mar 29 14:18:02 2013
@@ -335,8 +335,6 @@ class MultiProductSystem(Component):
for wiki_name, wiki_version, wiki_product in db("SELECT name,
version, product FROM '%s'" % table):
if wiki_name in self.system_wiki_list:
for product in all_products:
- self.log.info("Adding wiki page '%s' to product
'%s'",
- wiki_name, product.prefix)
db("""INSERT INTO %s (%s, product)
SELECT %s, '%s' FROM %s
WHERE name='%s' AND version=%s AND
product='%s'""" %
Modified:
bloodhound/branches/bep_0003_multiproduct/installer/bloodhound_setup.py
URL:
http://svn.apache.org/viewvc/bloodhound/branches/bep_0003_multiproduct/installer/bloodhound_setup.py?rev=1462482&r1=1462481&r2=1462482&view=diff
==============================================================================
--- bloodhound/branches/bep_0003_multiproduct/installer/bloodhound_setup.py
(original)
+++ bloodhound/branches/bep_0003_multiproduct/installer/bloodhound_setup.py Fri
Mar 29 14:18:02 2013
@@ -254,9 +254,18 @@ class BloodhoundSetup(object):
print "Running wiki upgrades"
bloodhound.onecmd('wiki upgrade')
- print "Running wiki bh upgrades"
+ print "Running wiki Bloodhound upgrades"
bloodhound.onecmd('wiki bh-upgrade')
+ print "Loading default product wiki"
+ bloodhound.onecmd('product admin @ wiki load %s' % " ".join(pages))
+
+ print "Running default product wiki upgrades"
+ bloodhound.onecmd('product admin @ wiki upgrade')
+
+ print "Running default product wiki Bloodhound upgrades"
+ bloodhound.onecmd('product admin @ wiki bh-upgrade')
+
print """
You can now start Bloodhound by running:
