Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Laurent S
erp5
Commits
9f1937f0
Commit
9f1937f0
authored
Jan 21, 2013
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
revert recent changes on ERP5Site_reindexAll that breaks bootstrap in several tests.
parent
e6268b0a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
14 deletions
+38
-14
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml
...mplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml
+33
-6
product/ERP5/bootstrap/erp5_core/bt/revision
product/ERP5/bootstrap/erp5_core/bt/revision
+1
-1
product/ERP5Catalog/tests/testERP5Catalog.py
product/ERP5Catalog/tests/testERP5Catalog.py
+4
-7
No files found.
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml
View file @
9f1937f0
...
...
@@ -155,18 +155,45 @@ context.portal_simulation.activate(\n
start_tree=start_tree,\n
stop_tree=stop_tree,)\n
\n
# We index tools secondly\n
print "#### Indexing tools ####"\n
# We index templates secondly\n
print "#### Indexing templates ####"\n
# Next we index trash bins\n
print "#### Indexing trash bins ####"\n
# Next we index domains\n
print "#### Indexing domains ####"\n
# Next we index applied rules\n
print "#### Indexing applied rules ####"\n
# Next we index delivery builders\n
print "#### Indexing delivery builders ####"\n
# Next we index order builders\n
print "#### Indexing order builders ####"\n
# Next we index portal types\n
print "#### Indexing portal types ####"\n
# Next we index portal_property_sheets\n
print "#### Indexing portal property sheets ####"\n
\n
folder_tag = \'module\'\n
folder_after_tag = (\'category\', \'person_stage_1\', \'group_person_stage_1\', preference_tag)\n
object_tag = \'document\'\n
object_after_tag = folder_after_tag\n
object_priority = 2 + additional_priority\n
tool_list = [x for x in portal.objectValues() if \\\n
x.uid not in (portal.getUid(), None) and \\\n
x.meta_type != \'ERP5 Folder\' and \\\n
x.id not in (\'portal_alarms\', \'portal_activities\', \'portal_preferences\', \'portal_simulation\', \'portal_uidhandler\')]\n
tool_list = [portal.portal_templates, portal.portal_trash,\n
portal.portal_domains, portal.portal_rules,\n
portal.portal_deliveries, portal.portal_orders,\n
portal.portal_caches, portal.portal_types,\n
portal.portal_property_sheets,\n
portal.portal_ids, portal.portal_memcached,]\n
possible_tool_list = [\n
\'portal_contribution_registry\',\n
\'portal_contributions\',\n
\'portal_gadgets\',\n
\'portal_integrations\',\n
\'portal_roundings\',\n
\'portal_solvers\',\n
]\n
for tool_id in possible_tool_list:\n
if getattr(portal, tool_id, None) is not None:\n
tool_list.append(getattr(portal, tool_id))\n
\n
for folder in tool_list:\n
folder.activate(\n
...
...
product/ERP5/bootstrap/erp5_core/bt/revision
View file @
9f1937f0
41059
\ No newline at end of file
41057
\ No newline at end of file
product/ERP5Catalog/tests/testERP5Catalog.py
View file @
9f1937f0
...
...
@@ -463,7 +463,6 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
title
=
"GreatTitle2"
)
# Flush message queue
self
.
tic
()
original_path_list
=
self
.
getSQLPathList
()
# Clear catalog
portal_catalog
=
self
.
getCatalogTool
()
portal_catalog
.
manage_catalogClear
()
...
...
@@ -483,9 +482,10 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
result
=
sql_connection
.
manage_test
(
sql
)
message_count
=
result
[
0
][
'COUNT(*)'
]
self
.
assertEquals
(
0
,
message_count
)
# Check if all objects are catalogued as before
new_path_list
=
self
.
getSQLPathList
()
self
.
assertEquals
(
set
(
original_path_list
)
-
set
(
new_path_list
),
set
())
# Check if object are catalogued
self
.
checkRelativeUrlInSQLPathList
([
organisation
.
getRelativeUrl
(),
'portal_categories/%s'
%
base_category
.
getRelativeUrl
()])
def
test_14_ReindexWithBrokenCategory
(
self
,
quiet
=
quiet
,
run
=
run_all_test
):
if
not
run
:
return
...
...
@@ -1531,9 +1531,6 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
# Flush message queue
self
.
tic
()
original_path_list
=
self
.
getSQLPathList
(
self
.
original_connection_id
)
new_path_list
=
self
.
getSQLPathList
(
self
.
new_connection_id
)
self
.
assertEquals
(
set
(
original_path_list
)
-
set
(
new_path_list
),
set
())
self
.
organisation2
=
module
.
newContent
(
portal_type
=
'Organisation'
,
title
=
"GreatTitle2"
)
first_deleted_url
=
self
.
organisation2
.
getRelativeUrl
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment