Author: jure
Date: Wed Mar 27 09:36:02 2013
New Revision: 1461469
URL: http://svn.apache.org/r1461469
Log:
Sync merge from trunk
Modified:
bloodhound/branches/bep_0003_multiproduct/ (props changed)
bloodhound/branches/bep_0003_multiproduct/installer/bloodhound_setup.py
bloodhound/branches/bep_0003_multiproduct/installer/requirements.txt
bloodhound/branches/bep_0003_multiproduct/trac/ (props changed)
bloodhound/branches/bep_0003_multiproduct/trac/trac/ticket/tests/batch.py
Propchange: bloodhound/branches/bep_0003_multiproduct/
------------------------------------------------------------------------------
Merged /incubator/bloodhound/trunk:r1460313-1461359
Merged /bloodhound/trunk:r1461360-1461467
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=1461469&r1=1461468&r2=1461469&view=diff
==============================================================================
--- bloodhound/branches/bep_0003_multiproduct/installer/bloodhound_setup.py
(original)
+++ bloodhound/branches/bep_0003_multiproduct/installer/bloodhound_setup.py Wed
Mar 27 09:36:02 2013
@@ -62,7 +62,7 @@ BASE_CONFIG = {'components': {'bhtheme.*
'permredirect.*': 'enabled',
'themeengine.api.*': 'enabled',
'themeengine.web_ui.*': 'enabled',
- 'bhsearch.*': 'disabled',
+ 'bhsearch.*': 'enabled',
'trac.ticket.web_ui.ticketmodule': 'disabled',
'trac.ticket.report.reportmodule': 'disabled',
},
@@ -87,6 +87,7 @@ BASE_CONFIG = {'components': {'bhtheme.*
'footer_left_prefix': '',
'footer_left_postfix': '',
'footer_right': ''},
+ 'bhsearch': {'is_default': 'true', 'enable_redirect': 'true'}
}
ACCOUNTS_CONFIG = {'account-manager': {'account_changes_notify_addresses' : '',
Modified: bloodhound/branches/bep_0003_multiproduct/installer/requirements.txt
URL:
http://svn.apache.org/viewvc/bloodhound/branches/bep_0003_multiproduct/installer/requirements.txt?rev=1461469&r1=1461468&r2=1461469&view=diff
==============================================================================
--- bloodhound/branches/bep_0003_multiproduct/installer/requirements.txt
(original)
+++ bloodhound/branches/bep_0003_multiproduct/installer/requirements.txt Wed
Mar 27 09:36:02 2013
@@ -27,4 +27,5 @@ TracThemeEngine
../bloodhound_dashboard
../bloodhound_theme
TracPermRedirect
+../bloodhound_search
Propchange: bloodhound/branches/bep_0003_multiproduct/trac/
------------------------------------------------------------------------------
Merged /incubator/bloodhound/trunk/trac:r1458171-1461359
Merged /bloodhound/trunk/trac:r1461360-1461467
Modified:
bloodhound/branches/bep_0003_multiproduct/trac/trac/ticket/tests/batch.py
URL:
http://svn.apache.org/viewvc/bloodhound/branches/bep_0003_multiproduct/trac/trac/ticket/tests/batch.py?rev=1461469&r1=1461468&r2=1461469&view=diff
==============================================================================
--- bloodhound/branches/bep_0003_multiproduct/trac/trac/ticket/tests/batch.py
(original)
+++ bloodhound/branches/bep_0003_multiproduct/trac/trac/ticket/tests/batch.py
Wed Mar 27 09:36:02 2013
@@ -1,6 +1,6 @@
from trac.perm import PermissionCache
from trac.test import Mock, EnvironmentStub
-from trac.ticket import default_workflow, web_ui
+from trac.ticket import api, default_workflow, web_ui
from trac.ticket.batch import BatchModifyModule
from trac.ticket.model import Ticket
from trac.util.datefmt import utc
@@ -13,7 +13,8 @@ class BatchModifyTestCase(unittest.TestC
def setUp(self):
self.env = EnvironmentStub(default_data=True,
enable=[default_workflow.ConfigurableTicketWorkflow,
- web_ui.TicketModule])
+ web_ui.TicketModule,
+ api.TicketSystem])
self.req = Mock(href=self.env.href, authname='anonymous', tz=utc)
self.req.session = {}
self.req.perm = PermissionCache(self.env)
