Commit 298b59a0 authored by Klaus Wölfel's avatar Klaus Wölfel Committed by Ivan Tyagov

erp5_core: add PyData Script

Conflicts:
	product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/PyData%20Script/proxy_role_view.xml
	product/ERP5/bootstrap/erp5_core/bt/template_action_path_list
parent bd5e4c85
...@@ -102,7 +102,6 @@ Property Type Validity Constraint | predicate ...@@ -102,7 +102,6 @@ Property Type Validity Constraint | predicate
Property Type Validity Constraint | view Property Type Validity Constraint | view
PyData Script | proxy_role_view PyData Script | proxy_role_view
PyData Script | repository_history_view PyData Script | repository_history_view
PyData Script | run
  • @klaus @Tyagov This seem to be a problem in the merge. When using git tab on erp5_core, I have:

    Screenshot_2017-11-27_at_11.35.05

  • @jerome, I will check asap. Sorry for delay. I confirm it should be there so it is a regression.

  • @jerome , fixed.

Please register or sign in to reply
PyData Script | view PyData Script | view
Python Script | proxy_role_view Python Script | proxy_role_view
Python Script | repository_history_view Python Script | repository_history_view
...@@ -157,4 +156,4 @@ portal_actions | types_tool ...@@ -157,4 +156,4 @@ portal_actions | types_tool
portal_membership | login portal_membership | login
portal_membership | logout portal_membership | logout
portal_membership | preferences portal_membership | preferences
portal_undo | undo portal_undo | undo
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment