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
Labels
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Jérome Perrin
erp5
Commits
e7c4e387
Commit
e7c4e387
authored
4 years ago
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "core: Show "Diff Object" / "Diff Module Objects" only to manager"
This reverts commit
06a7737f
.
parent
99c1c6c0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testERP5Core.py
...tTemplateItem/portal_components/test.erp5.testERP5Core.py
+2
-0
product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/diff_multiple_object_action.xml
...rtal_types/portal_actions/diff_multiple_object_action.xml
+1
-1
product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/diff_object_action.xml
...teItem/portal_types/portal_actions/diff_object_action.xml
+1
-1
No files found.
bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testERP5Core.py
View file @
e7c4e387
...
@@ -264,6 +264,7 @@ class TestERP5Core(ERP5TypeTestCase, ZopeTestCase.Functional):
...
@@ -264,6 +264,7 @@ class TestERP5Core(ERP5TypeTestCase, ZopeTestCase.Functional):
expected
=
{
'folder'
:
[],
expected
=
{
'folder'
:
[],
'global'
:
[],
'global'
:
[],
'object'
:
[],
'object'
:
[],
'object_action'
:
[{
'id'
:
'diff_object_action'
,
'title'
:
'Diff Object'
}],
'object_exchange'
:
[{
'id'
:
'csv_export'
,
'title'
:
'Export Csv File'
}],
# erp5_csv_style
'object_exchange'
:
[{
'id'
:
'csv_export'
,
'title'
:
'Export Csv File'
}],
# erp5_csv_style
'object_hidden'
:
[{
'id'
:
'view_historical_comparison'
,
'object_hidden'
:
[{
'id'
:
'view_historical_comparison'
,
'title'
:
'View Historical Comparison'
},
'title'
:
'View Historical Comparison'
},
...
@@ -285,6 +286,7 @@ class TestERP5Core(ERP5TypeTestCase, ZopeTestCase.Functional):
...
@@ -285,6 +286,7 @@ class TestERP5Core(ERP5TypeTestCase, ZopeTestCase.Functional):
expected
=
{
'folder'
:
[],
expected
=
{
'folder'
:
[],
'global'
:
[],
'global'
:
[],
'object'
:
[],
'object'
:
[],
'object_action'
:
[{
'id'
:
'diff_object_action'
,
'title'
:
'Diff Object'
}],
'object_exchange'
:
[{
'id'
:
'csv_export'
,
'title'
:
'Export Csv File'
}],
# erp5_csv_style
'object_exchange'
:
[{
'id'
:
'csv_export'
,
'title'
:
'Export Csv File'
}],
# erp5_csv_style
'object_hidden'
:
[{
'id'
:
'view_historical_comparison'
,
'object_hidden'
:
[{
'id'
:
'view_historical_comparison'
,
'title'
:
'View Historical Comparison'
},
'title'
:
'View Historical Comparison'
},
...
...
This diff is collapsed.
Click to expand it.
product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/diff_multiple_object_action.xml
View file @
e7c4e387
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
<key>
<string>
permissions
</string>
</key>
<key>
<string>
permissions
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
Manage portal
</string>
<string>
View
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
...
This diff is collapsed.
Click to expand it.
product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/portal_actions/diff_object_action.xml
View file @
e7c4e387
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
<key>
<string>
permissions
</string>
</key>
<key>
<string>
permissions
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
Manage portal
</string>
<string>
View
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
...
This diff is collapsed.
Click to expand it.
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