1. Olemis Lang
  2. bloodhound-mq

Commits

Olemis Lang  committed 7a5595f Merge

BH Multiproduct #669 : Code for new product form ID included in a separate patch

  • Participants
  • Parent commits d3ad5e3, 337d961
  • Branches t669_product_edit

Comments (0)

Files changed (5)

File series

View file
  • Ignore whitespace
 #t621/t621_r1508753_ticket_version_label.diff
 t387/t387_r1514232_functional_test.4.diff
 t387/t387_r1514860_functional_test.5.diff
-t598/t598_r1510975_functional_tester_product.diff
+#t575/t575_r1496958_product_title_index.diff
+#t575/t575_r1496958_product_recent_changes.diff
 t387/t387_r1515319_functional_test.6.diff
 t387/t387_r1515319_functional_test.7.diff
 t598/t598_r1510975_new_product_intertracwiki.diff
+t598/t598_r1526159_form_id.diff
+t598/t598_r1510975_functional_tester_product.diff
 t598/t598_r1510975_test_new_product.diff
 t669/t669_r1525378_product_edit.diff
 t669/t669_r1525378_product_edit.tests.diff

File t575/t575_r1496958_product_recent_changes.diff

View file
  • Ignore whitespace
+# HG changeset patch
+# Parent 8ac50879bc9e7e3c18d603e20875675a5ae74350
+BH Multiproduct #575 : RecentChanges wiki page for new products
+
+diff -r 8ac50879bc9e bloodhound_multiproduct/multiproduct/api.py
+--- a/bloodhound_multiproduct/multiproduct/api.py	Sun Jun 30 01:44:33 2013 -0500
++++ b/bloodhound_multiproduct/multiproduct/api.py	Sun Jun 30 01:45:13 2013 -0500
+@@ -544,7 +544,7 @@
+ 
+         # Import default pages in product wiki
+         wikiadmin = WikiAdmin(ProductEnvironment(self.env, product.prefix))
+-        pages = ('TitleIndex',)
++        pages = ('TitleIndex', 'RecentChanges')
+         for page in pages:
+             filename = resource_filename('trac.wiki', 'default-pages/' + page)
+             wikiadmin.import_page(filename, page)

File t575/t575_r1496958_product_title_index.diff

View file
  • Ignore whitespace
+# HG changeset patch
+# Parent 3c1e652d3ebc360f9824fc1c507192f8df51b1aa
+BH Multiproduct #575 : TitleIndex wiki page for new products
+
+diff -r 3c1e652d3ebc bloodhound_multiproduct/multiproduct/api.py
+--- a/bloodhound_multiproduct/multiproduct/api.py	Wed Jun 26 15:15:52 2013 +0000
++++ b/bloodhound_multiproduct/multiproduct/api.py	Thu Jun 27 02:24:29 2013 -0500
+@@ -40,6 +40,7 @@
+ from trac.util.translation import _, N_
+ from trac.web.chrome import ITemplateProvider, add_warning
+ from trac.web.main import FakePerm, FakeSession
++from trac.wiki.admin import WikiAdmin
+ from trac.wiki.api import IWikiSyntaxProvider
+ from trac.wiki.parser import WikiParser
+ 
+@@ -541,6 +542,13 @@
+                     (table[0], ','.join(cols), ','.join(['%s' for c in cols])),
+                     rows)
+ 
++        # Import default pages in product wiki
++        wikiadmin = WikiAdmin(ProductEnvironment(self.env, product.prefix))
++        pages = ('TitleIndex',)
++        for page in pages:
++            filename = resource_filename('trac.wiki', 'default-pages/' + page)
++            wikiadmin.import_page(filename, page)
++
+     def resource_changed(self, resource, old_values, context):
+         return
+ 

File t598/t598_r1526159_form_id.diff

View file
  • Ignore whitespace
+# HG changeset patch
+# Parent 4383b83928b119e7ae0aeb837447f0b935d63d79
+BH Theme #598 : New product form ID
+
+diff -r 4383b83928b1 bloodhound_theme/bhtheme/templates/bh_product_list.html
+--- a/bloodhound_theme/bhtheme/templates/bh_product_list.html	Wed Sep 25 12:16:27 2013 -0500
++++ b/bloodhound_theme/bhtheme/templates/bh_product_list.html	Wed Sep 25 12:30:23 2013 -0500
+@@ -37,7 +37,7 @@
+         <xi:include href="widget_media_list.html" py:with="items = products"/>
+ 
+         <div py:if="'PRODUCT_CREATE' in perm" class="btn-group">
+-          <form method="get" action="${href.products()}">
++          <form id="new" method="get" action="${href.products()}">
+             <input type="hidden" name="action" value="new" />
+             <input class="btn" type="submit" value="${_('Add new product')}" />
+           </form>

File t669/t669_r1525378_product_edit.diff

View file
  • Ignore whitespace
 # HG changeset patch
-# Parent c58a0213e3a52ec06b81272d0ec1d283781e9c54
+# Parent c6cdd6f9c1e823cd56199dffdb233d835b92c352
 BH Theme #669 : Edit link for products
 
-diff -r c58a0213e3a5 bloodhound_multiproduct/multiproduct/hooks.py
---- a/bloodhound_multiproduct/multiproduct/hooks.py	Tue Sep 24 23:49:23 2013 -0500
-+++ b/bloodhound_multiproduct/multiproduct/hooks.py	Wed Sep 25 00:01:38 2013 -0500
+diff -r c6cdd6f9c1e8 bloodhound_multiproduct/multiproduct/hooks.py
+--- a/bloodhound_multiproduct/multiproduct/hooks.py	Wed Sep 25 12:46:03 2013 -0500
++++ b/bloodhound_multiproduct/multiproduct/hooks.py	Wed Sep 25 12:47:24 2013 -0500
 @@ -37,13 +37,14 @@
      def open_environment(self, environ, env_path, global_env, use_cache=False):
          environ.setdefault('SCRIPT_NAME', '')  # bh:ticket:594
  
          return env
  
-diff -r c58a0213e3a5 bloodhound_theme/bhtheme/templates/bh_product_list.html
---- a/bloodhound_theme/bhtheme/templates/bh_product_list.html	Tue Sep 24 23:49:23 2013 -0500
-+++ b/bloodhound_theme/bhtheme/templates/bh_product_list.html	Wed Sep 25 00:01:38 2013 -0500
-@@ -37,7 +37,7 @@
-         <xi:include href="widget_media_list.html" py:with="items = products"/>
- 
-         <div py:if="'PRODUCT_CREATE' in perm" class="btn-group">
--          <form method="get" action="${href.products()}">
-+          <form id="new" method="get" action="${href.products()}">
-             <input type="hidden" name="action" value="new" />
-             <input class="btn" type="submit" value="${_('Add new product')}" />
-           </form>
-diff -r c58a0213e3a5 bloodhound_theme/bhtheme/theme.py
---- a/bloodhound_theme/bhtheme/theme.py	Tue Sep 24 23:49:23 2013 -0500
-+++ b/bloodhound_theme/bhtheme/theme.py	Wed Sep 25 00:01:38 2013 -0500
+diff -r c6cdd6f9c1e8 bloodhound_theme/bhtheme/theme.py
+--- a/bloodhound_theme/bhtheme/theme.py	Wed Sep 25 12:46:03 2013 -0500
++++ b/bloodhound_theme/bhtheme/theme.py	Wed Sep 25 12:47:24 2013 -0500
 @@ -468,18 +468,26 @@
                          description=format_to_html(self.env,
                                                     product_ctx(product),