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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Iliya Manolov
erp5
Commits
d986738a
Commit
d986738a
authored
Feb 29, 2012
by
Arnaud Fontaine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typos.
parent
68d21e92
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
23 deletions
+23
-23
product/ERP5/Document/BusinessTemplate.py
product/ERP5/Document/BusinessTemplate.py
+1
-1
product/ERP5/tests/testBusinessTemplate.py
product/ERP5/tests/testBusinessTemplate.py
+18
-18
product/ERP5Type/Constraint/PortalTypeClass.py
product/ERP5Type/Constraint/PortalTypeClass.py
+4
-4
No files found.
product/ERP5/Document/BusinessTemplate.py
View file @
d986738a
...
@@ -259,7 +259,7 @@ def createSkinSelection(skin_tool, skin_name):
...
@@ -259,7 +259,7 @@ def createSkinSelection(skin_tool, skin_name):
# - they explictly define a list of
# - they explictly define a list of
# "business_template_registered_skin_selections", and we
# "business_template_registered_skin_selections", and we
# are not in this list.
# are not in this list.
# - they are not registred in the default skin selection
# - they are not regist
e
red in the default skin selection
skin_path
=
''
skin_path
=
''
for
skin_folder
in
skin_tool
.
objectValues
():
for
skin_folder
in
skin_tool
.
objectValues
():
if
skin_name
in
skin_folder
.
getProperty
(
if
skin_name
in
skin_folder
.
getProperty
(
...
...
product/ERP5/tests/testBusinessTemplate.py
View file @
d986738a
...
@@ -1018,7 +1018,7 @@ class BusinessTemplateMixin(ERP5TypeTestCase, LogInterceptor):
...
@@ -1018,7 +1018,7 @@ class BusinessTemplateMixin(ERP5TypeTestCase, LogInterceptor):
bt
.
edit
(
template_skin_id_list
=
template_skin_id_list
)
bt
.
edit
(
template_skin_id_list
=
template_skin_id_list
)
def
stepAddRegistredSelectionToBusinessTemplate
(
self
,
sequence
=
None
,
**
kw
):
def
stepAddRegist
e
redSelectionToBusinessTemplate
(
self
,
sequence
=
None
,
**
kw
):
"""
"""
Add registered selection to business template
Add registered selection to business template
"""
"""
...
@@ -1027,7 +1027,7 @@ class BusinessTemplateMixin(ERP5TypeTestCase, LogInterceptor):
...
@@ -1027,7 +1027,7 @@ class BusinessTemplateMixin(ERP5TypeTestCase, LogInterceptor):
bt
.
edit
(
template_registered_skin_selection_list
=
\
bt
.
edit
(
template_registered_skin_selection_list
=
\
(
'%s | Foo'
%
sequence
.
get
(
'skin_folder_id'
),
))
(
'%s | Foo'
%
sequence
.
get
(
'skin_folder_id'
),
))
def
stepEditRegistredSelectionToBusinessTemplate
(
self
,
sequence
=
None
,
**
kw
):
def
stepEditRegist
e
redSelectionToBusinessTemplate
(
self
,
sequence
=
None
,
**
kw
):
"""
"""
Add registered selection to business template
Add registered selection to business template
"""
"""
...
@@ -2814,7 +2814,7 @@ class BusinessTemplateMixin(ERP5TypeTestCase, LogInterceptor):
...
@@ -2814,7 +2814,7 @@ class BusinessTemplateMixin(ERP5TypeTestCase, LogInterceptor):
description
=
'bt for unit_test'
)
description
=
'bt for unit_test'
)
sequence
.
edit
(
dependency_bt
=
template
)
sequence
.
edit
(
dependency_bt
=
template
)
def
stepSetSkinFolderRegistredSelections
(
self
,
sequence
=
None
,
**
kw
):
def
stepSetSkinFolderRegist
e
redSelections
(
self
,
sequence
=
None
,
**
kw
):
ps
=
self
.
getSkinsTool
()
ps
=
self
.
getSkinsTool
()
skin_id
=
sequence
.
get
(
'skin_folder_id'
)
skin_id
=
sequence
.
get
(
'skin_folder_id'
)
skin_folder
=
ps
.
_getOb
(
skin_id
,
None
)
skin_folder
=
ps
.
_getOb
(
skin_id
,
None
)
...
@@ -2822,7 +2822,7 @@ class BusinessTemplateMixin(ERP5TypeTestCase, LogInterceptor):
...
@@ -2822,7 +2822,7 @@ class BusinessTemplateMixin(ERP5TypeTestCase, LogInterceptor):
'business_template_registered_skin_selections'
,
(
'Foo'
,),
'business_template_registered_skin_selections'
,
(
'Foo'
,),
type
=
'tokens'
)
type
=
'tokens'
)
def
stepSetSkinFolderRegistredSelections2
(
self
,
sequence
=
None
,
**
kw
):
def
stepSetSkinFolderRegist
e
redSelections2
(
self
,
sequence
=
None
,
**
kw
):
ps
=
self
.
getSkinsTool
()
ps
=
self
.
getSkinsTool
()
skin_id
=
sequence
.
get
(
'skin_folder_id'
)
skin_id
=
sequence
.
get
(
'skin_folder_id'
)
skin_folder
=
ps
.
_getOb
(
skin_id
,
None
)
skin_folder
=
ps
.
_getOb
(
skin_id
,
None
)
...
@@ -2833,7 +2833,7 @@ class BusinessTemplateMixin(ERP5TypeTestCase, LogInterceptor):
...
@@ -2833,7 +2833,7 @@ class BusinessTemplateMixin(ERP5TypeTestCase, LogInterceptor):
ps
=
self
.
getSkinsTool
()
ps
=
self
.
getSkinsTool
()
ps
.
manage_skinLayers
(
skinpath
=
(
'erp5_core'
,),
skinname
=
'Foo'
,
add_skin
=
1
)
ps
.
manage_skinLayers
(
skinpath
=
(
'erp5_core'
,),
skinname
=
'Foo'
,
add_skin
=
1
)
def
stepSetStaticSkinFolderRegistredSelections
(
self
,
sequence
=
None
,
**
kw
):
def
stepSetStaticSkinFolderRegist
e
redSelections
(
self
,
sequence
=
None
,
**
kw
):
ps
=
self
.
getSkinsTool
()
ps
=
self
.
getSkinsTool
()
skin_id
=
sequence
.
get
(
'static_skin_folder_id'
)
skin_id
=
sequence
.
get
(
'static_skin_folder_id'
)
skin_folder
=
ps
.
_getOb
(
skin_id
,
None
)
skin_folder
=
ps
.
_getOb
(
skin_id
,
None
)
...
@@ -5364,11 +5364,11 @@ class TestBusinessTemplate(BusinessTemplateMixin):
...
@@ -5364,11 +5364,11 @@ class TestBusinessTemplate(BusinessTemplateMixin):
sequence_list
=
SequenceList
()
sequence_list
=
SequenceList
()
sequence_string
=
'
\
sequence_string
=
'
\
CreateSkinFolder
\
CreateSkinFolder
\
SetSkinFolderRegistredSelections
\
SetSkinFolderRegist
e
redSelections
\
CreateNewBusinessTemplate
\
CreateNewBusinessTemplate
\
UseExportBusinessTemplate
\
UseExportBusinessTemplate
\
AddSkinFolderToBusinessTemplate
\
AddSkinFolderToBusinessTemplate
\
AddRegistredSelectionToBusinessTemplate
\
AddRegist
e
redSelectionToBusinessTemplate
\
BuildBusinessTemplate
\
BuildBusinessTemplate
\
SaveBusinessTemplate
\
SaveBusinessTemplate
\
RemoveSkinFolder
\
RemoveSkinFolder
\
...
@@ -5946,11 +5946,11 @@ class TestBusinessTemplate(BusinessTemplateMixin):
...
@@ -5946,11 +5946,11 @@ class TestBusinessTemplate(BusinessTemplateMixin):
"""Test Business Template Uninstall With Skin Selection"""
"""Test Business Template Uninstall With Skin Selection"""
sequence_list
=
SequenceList
()
sequence_list
=
SequenceList
()
sequence_string
=
'CreateSkinFolder
\
sequence_string
=
'CreateSkinFolder
\
SetSkinFolderRegistredSelections
\
SetSkinFolderRegist
e
redSelections
\
CreateNewBusinessTemplate
\
CreateNewBusinessTemplate
\
UseExportBusinessTemplate
\
UseExportBusinessTemplate
\
AddSkinFolderToBusinessTemplate
\
AddSkinFolderToBusinessTemplate
\
AddRegistredSelectionToBusinessTemplate
\
AddRegist
e
redSelectionToBusinessTemplate
\
BuildBusinessTemplate
\
BuildBusinessTemplate
\
SaveBusinessTemplate
\
SaveBusinessTemplate
\
RemoveSkinFolder
\
RemoveSkinFolder
\
...
@@ -5971,12 +5971,12 @@ class TestBusinessTemplate(BusinessTemplateMixin):
...
@@ -5971,12 +5971,12 @@ class TestBusinessTemplate(BusinessTemplateMixin):
sequence_string
=
'CreateSkinFolder
\
sequence_string
=
'CreateSkinFolder
\
CreateStaticSkinFolder
\
CreateStaticSkinFolder
\
CreateSkinSelection
\
CreateSkinSelection
\
SetSkinFolderRegistredSelections
\
SetSkinFolderRegist
e
redSelections
\
SetStaticSkinFolderRegistredSelections
\
SetStaticSkinFolderRegist
e
redSelections
\
CreateNewBusinessTemplate
\
CreateNewBusinessTemplate
\
UseExportBusinessTemplate
\
UseExportBusinessTemplate
\
AddSkinFolderToBusinessTemplate
\
AddSkinFolderToBusinessTemplate
\
AddRegistredSelectionToBusinessTemplate
\
AddRegist
e
redSelectionToBusinessTemplate
\
BuildBusinessTemplate
\
BuildBusinessTemplate
\
SaveBusinessTemplate
\
SaveBusinessTemplate
\
RemoveSkinFolder
\
RemoveSkinFolder
\
...
@@ -5995,11 +5995,11 @@ class TestBusinessTemplate(BusinessTemplateMixin):
...
@@ -5995,11 +5995,11 @@ class TestBusinessTemplate(BusinessTemplateMixin):
"""Test Business Template will not register existing Skin"""
"""Test Business Template will not register existing Skin"""
sequence_list
=
SequenceList
()
sequence_list
=
SequenceList
()
sequence_string
=
'CreateSkinFolder
\
sequence_string
=
'CreateSkinFolder
\
SetSkinFolderRegistredSelections
\
SetSkinFolderRegist
e
redSelections
\
CreateNewBusinessTemplate
\
CreateNewBusinessTemplate
\
UseExportBusinessTemplate
\
UseExportBusinessTemplate
\
AddSkinFolderToBusinessTemplate
\
AddSkinFolderToBusinessTemplate
\
AddRegistredSelectionToBusinessTemplate
\
AddRegist
e
redSelectionToBusinessTemplate
\
BuildBusinessTemplate
\
BuildBusinessTemplate
\
SaveBusinessTemplate
\
SaveBusinessTemplate
\
RemoveSkinFolder
\
RemoveSkinFolder
\
...
@@ -6081,11 +6081,11 @@ class TestBusinessTemplate(BusinessTemplateMixin):
...
@@ -6081,11 +6081,11 @@ class TestBusinessTemplate(BusinessTemplateMixin):
sequence_list
=
SequenceList
()
sequence_list
=
SequenceList
()
sequence_list
.
addSequenceString
(
"""
sequence_list
.
addSequenceString
(
"""
CreateSkinFolder
CreateSkinFolder
SetSkinFolderRegistredSelections
SetSkinFolderRegist
e
redSelections
CreateNewBusinessTemplate
CreateNewBusinessTemplate
UseExportBusinessTemplate
UseExportBusinessTemplate
AddSkinFolderToBusinessTemplate
AddSkinFolderToBusinessTemplate
AddRegistredSelectionToBusinessTemplate
AddRegist
e
redSelectionToBusinessTemplate
BuildBusinessTemplate
BuildBusinessTemplate
SaveBusinessTemplate
SaveBusinessTemplate
RemoveSkinFolder
RemoveSkinFolder
...
@@ -6118,9 +6118,9 @@ class TestBusinessTemplate(BusinessTemplateMixin):
...
@@ -6118,9 +6118,9 @@ class TestBusinessTemplate(BusinessTemplateMixin):
CheckModifiedSkinFolderExists
CheckModifiedSkinFolderExists
CheckSkinSelectionAdded
CheckSkinSelectionAdded
SetSkinFolderRegistredSelections2
SetSkinFolderRegist
e
redSelections2
CopyBusinessTemplate
CopyBusinessTemplate
EditRegistredSelectionToBusinessTemplate
EditRegist
e
redSelectionToBusinessTemplate
BuildBusinessTemplate
BuildBusinessTemplate
InstallCurrentBusinessTemplate
InstallCurrentBusinessTemplate
Tic
Tic
...
...
product/ERP5Type/Constraint/PortalTypeClass.py
View file @
d986738a
...
@@ -47,12 +47,12 @@ class PortalTypeClass(Constraint):
...
@@ -47,12 +47,12 @@ class PortalTypeClass(Constraint):
},
},
"""
"""
_message_id_list
=
[
'message_type_not_registred'
,
_message_id_list
=
[
'message_type_not_regist
e
red'
,
'message_inconsistent_meta_type'
,
'message_inconsistent_meta_type'
,
'message_inconsistent_class'
]
'message_inconsistent_class'
]
message_type_not_registred
=
"Type Information ${type_name} not "
\
message_type_not_regist
e
red
=
"Type Information ${type_name} not "
\
"regist
red with the TypeTool"
"registe
red with the TypeTool"
message_inconsistent_meta_type
=
"Meta type is inconsistant with portal"
\
message_inconsistent_meta_type
=
"Meta type is inconsistant with portal"
\
" type definition. Portal type meta type is ${portal_type_meta_type}"
\
" type definition. Portal type meta type is ${portal_type_meta_type}"
\
" class meta type is ${class_meta_type}"
" class meta type is ${class_meta_type}"
...
@@ -68,7 +68,7 @@ class PortalTypeClass(Constraint):
...
@@ -68,7 +68,7 @@ class PortalTypeClass(Constraint):
type_info
=
types_tool
.
_getOb
(
obj
.
getPortalType
(),
None
)
type_info
=
types_tool
.
_getOb
(
obj
.
getPortalType
(),
None
)
if
type_info
is
None
:
if
type_info
is
None
:
error_list
.
append
(
self
.
_generateError
(
obj
,
error_list
.
append
(
self
.
_generateError
(
obj
,
self
.
_getMessage
(
'message_type_not_registred'
),
self
.
_getMessage
(
'message_type_not_regist
e
red'
),
mapping
=
dict
(
type_name
=
obj
.
getPortalType
())))
mapping
=
dict
(
type_name
=
obj
.
getPortalType
())))
elif
type_info
.
content_meta_type
!=
obj
.
meta_type
:
elif
type_info
.
content_meta_type
!=
obj
.
meta_type
:
error_list
.
append
(
self
.
_generateError
(
obj
,
error_list
.
append
(
self
.
_generateError
(
obj
,
...
...
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