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
1
Merge Requests
1
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
Boxiang Sun
erp5
Commits
13ce944f
Commit
13ce944f
authored
Mar 04, 2016
by
Yusei Tahara
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'master'
A bug fix of erp5_core/Folder_delete See merge request
!65
parents
10f0a21f
10fefa8f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml
...SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml
+1
-2
product/ERP5/tests/testERP5Core.py
product/ERP5/tests/testERP5Core.py
+3
-2
No files found.
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml
View file @
13ce944f
...
...
@@ -150,8 +150,7 @@ elif uids:\n
else:\n
message = Base_translateString("Please select one or more items first.")\n
\n
return REQUEST.RESPONSE.redirect("%s/%s?portal_status_message=%s"\n
% (context.absolute_url_path(), form_id, message))\n
return context.Base_redirect(form_id, keep_items={"portal_status_message":message})\n
]]>
</string>
</value>
...
...
product/ERP5/tests/testERP5Core.py
View file @
13ce944f
...
...
@@ -32,6 +32,7 @@ import pprint
import
httplib
import
urlparse
import
base64
import
urllib
from
AccessControl.SecurityManagement
import
newSecurityManager
from
Testing
import
ZopeTestCase
...
...
@@ -512,7 +513,7 @@ class TestERP5Core(ERP5TypeTestCase, ZopeTestCase.Functional):
self
.
assertEqual
(
0
,
person
.
getRelationCountForDeletion
())
def
delete
(
assert_deleted
,
obj
):
redirect
=
self
.
_Folder_delete
(
obj
)
self
.
assertTrue
((
'Sorry, 1 item is in use.'
,
'Deleted.'
)[
assert_deleted
]
self
.
assertTrue
((
urllib
.
quote
(
'Sorry, 1 item is in use.'
)
,
'Deleted.'
)[
assert_deleted
]
in
redirect
,
redirect
)
self
.
tic
()
delete
(
0
,
organisation
)
...
...
@@ -541,7 +542,7 @@ class TestERP5Core(ERP5TypeTestCase, ZopeTestCase.Functional):
document_1
.
manage_permission
(
'View'
,
[],
acquire
=
0
)
document_1
.
manage_permission
(
'Access contents information'
,
[],
acquire
=
0
)
redirect
=
self
.
_Folder_delete
(
document_2
)
self
.
assert_
(
'Sorry, 1 item is in use.'
in
redirect
,
redirect
)
self
.
assert_
(
urllib
.
quote
(
'Sorry, 1 item is in use.'
)
in
redirect
,
redirect
)
self
.
assertEqual
(
module
.
objectCount
(),
2
)
def
test_getPropertyForUid
(
self
):
...
...
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