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
f2f6d69b
Commit
f2f6d69b
authored
Aug 13, 2013
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Patch ZMI to use ace editor
parent
47097d9e
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
238 additions
and
1 deletion
+238
-1
bt5/erp5_administration/ExtensionTemplateItem/portal_components/extension.erp5.ERP5Administration.py
...em/portal_components/extension.erp5.ERP5Administration.py
+62
-0
bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/ERP5Site_checkPythonScriptAsJSON.xml
.../erp5_administration/ERP5Site_checkPythonScriptAsJSON.xml
+28
-0
bt5/erp5_administration/bt/revision
bt5/erp5_administration/bt/revision
+1
-1
product/ERP5Type/ZopePatch.py
product/ERP5Type/ZopePatch.py
+1
-0
product/ERP5Type/patches/AceEditorZMI.py
product/ERP5Type/patches/AceEditorZMI.py
+146
-0
No files found.
bt5/erp5_administration/ExtensionTemplateItem/portal_components/extension.erp5.ERP5Administration.py
View file @
f2f6d69b
...
@@ -137,6 +137,7 @@ def checkConversionToolAvailability(self):
...
@@ -137,6 +137,7 @@ def checkConversionToolAvailability(self):
active_process
.
activateResult
(
result
)
active_process
.
activateResult
(
result
)
def
runPyflakes
(
script_code
,
script_path
):
def
runPyflakes
(
script_code
,
script_path
):
# TODO: reuse _runPyflakes ...
from
pyflakes.api
import
check
from
pyflakes.api
import
check
from
pyflakes
import
reporter
from
pyflakes
import
reporter
from
StringIO
import
StringIO
from
StringIO
import
StringIO
...
@@ -144,3 +145,64 @@ def runPyflakes(script_code, script_path):
...
@@ -144,3 +145,64 @@ def runPyflakes(script_code, script_path):
check
(
script_code
,
script_path
,
reporter
.
Reporter
(
stream
,
stream
))
check
(
script_code
,
script_path
,
reporter
.
Reporter
(
stream
,
stream
))
return
stream
.
getvalue
()
return
stream
.
getvalue
()
def
runPyflakesOnPythonScript
(
self
,
data
):
import
json
# XXX data is encoded as json, because jQuery serialize lists as []
if
isinstance
(
data
,
basestring
):
data
=
json
.
loads
(
data
)
# data contains the code, the bound names and the script params. From this
# we reconstruct a function that can be parsed with pyflakes.
code
=
data
def
indent
(
text
):
return
''
.
join
((
" "
+
line
)
for
line
in
text
.
splitlines
(
True
))
bound_names
=
data
[
'bound_names'
]
signature_parts
=
data
[
'bound_names'
]
if
data
[
'params'
]:
signature_parts
+=
[
data
[
'params'
]]
signature
=
", "
.
join
(
signature_parts
)
function_name
=
"function_name"
body
=
"def %s(%s):
\
n
%s"
%
(
function_name
,
signature
,
indent
(
data
[
'code'
])
or
" pass"
)
error_list
=
_runPyflakes
(
body
,
lineno_offset
=-
1
)
self
.
REQUEST
.
RESPONSE
.
setHeader
(
'content-type'
,
'application/json'
)
return
json
.
dumps
(
dict
(
annotations
=
error_list
))
def
_runPyflakes
(
code
,
lineno_offset
=
0
):
import
pyflakes.api
error_list
=
[]
class
Reporter
(
object
):
def
unexpectedError
(
self
,
filename
,
msg
):
error_list
.
append
(
{
'row'
:
0
,
'column'
:
0
,
'text'
:
msg
,
'type'
:
'error'
}
)
def
syntaxError
(
self
,
filename
,
msg
,
lineno
,
offset
,
text
):
error_list
.
append
(
{
'row'
:
lineno
-
1
+
lineno_offset
,
'column'
:
offset
,
'text'
:
msg
+
(
text
and
": "
+
text
or
''
),
'type'
:
'error'
}
)
def
flake
(
self
,
message
):
error_list
.
append
(
{
'row'
:
message
.
lineno
-
1
+
lineno_offset
,
'column'
:
getattr
(
message
,
'col'
,
0
),
'text'
:
message
.
message
%
message
.
message_args
,
'type'
:
'warning'
}
)
pyflakes
.
api
.
check
(
code
,
''
,
Reporter
())
return
error_list
bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/ERP5Site_checkPythonScriptAsJSON.xml
0 → 100644
View file @
f2f6d69b
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ExternalMethod"
module=
"Products.ExternalMethod.ExternalMethod"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_function
</string>
</key>
<value>
<string>
runPyflakesOnPythonScript
</string>
</value>
</item>
<item>
<key>
<string>
_module
</string>
</key>
<value>
<string>
ERP5Administration
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
ERP5Site_checkPythonScriptAsJSON
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_administration/bt/revision
View file @
f2f6d69b
156
157
\ No newline at end of file
\ No newline at end of file
product/ERP5Type/ZopePatch.py
View file @
f2f6d69b
...
@@ -75,6 +75,7 @@ from Products.ERP5Type.patches import OFSImage
...
@@ -75,6 +75,7 @@ from Products.ERP5Type.patches import OFSImage
from
Products.ERP5Type.patches
import
_transaction
from
Products.ERP5Type.patches
import
_transaction
from
Products.ERP5Type.patches
import
default_zpublisher_encoding
from
Products.ERP5Type.patches
import
default_zpublisher_encoding
from
Products.ERP5Type.patches
import
DCWorkflowGraph
from
Products.ERP5Type.patches
import
DCWorkflowGraph
from
Products.ERP5Type.patches
import
AceEditorZMI
# These symbols are required for backward compatibility
# These symbols are required for backward compatibility
from
Products.ERP5Type.patches.PropertyManager
import
ERP5PropertyManager
from
Products.ERP5Type.patches.PropertyManager
import
ERP5PropertyManager
...
...
product/ERP5Type/patches/AceEditorZMI.py
0 → 100644
View file @
f2f6d69b
from
App.Management
import
Navigation
from
Acquisition
import
aq_parent
import
json
def
manage_page_footer
(
self
):
default
=
'</body></html>'
# Not within an ERP5 Site, use default footer
if
getattr
(
self
,
'getPortalObject'
,
None
)
is
None
:
return
default
portal
=
self
.
getPortalObject
()
if
portal
.
portal_preferences
.
getPreference
(
'preferred_source_code_editor'
)
!=
'ace'
:
return
default
# REQUEST['PUBLISHED'] can be the form in the acquisition context of the
# document, or a method bound to the document (after a POST it is a bound method)
published
=
self
.
REQUEST
[
'PUBLISHED'
]
document
=
getattr
(
published
,
'im_self'
,
None
)
# bound mehtod
if
document
is
None
:
document
=
aq_parent
(
published
)
if
getattr
(
document
,
'meta_type'
,
None
)
is
None
:
return
default
portal_url
=
portal
.
portal_url
()
mode
=
'plain_text'
# default mode
textarea_selector
=
''
# jQuery selector for the origin textarea that we will
# change into an ace editor
live_check_python_script
=
0
# Check python scripts on the fly
bound_names
=
'undefined'
if
document
.
meta_type
in
(
'DTML Document'
,
'DTML Method'
):
if
document
.
getId
().
endswith
(
'.js'
):
mode
=
'javascript'
elif
document
.
getId
().
endswith
(
'.css'
):
mode
=
'css'
textarea_selector
=
'textarea[name="data:text"]'
elif
document
.
meta_type
in
(
'File'
,
):
if
'javascript'
in
document
.
getContentType
():
mode
=
'javascript'
elif
'css'
in
document
.
getContentType
():
mode
=
'css'
textarea_selector
=
'textarea[name="filedata:text"]'
elif
document
.
meta_type
in
(
'Script (Python)'
,
):
mode
=
'python'
textarea_selector
=
'textarea[name="body:text"]'
# printed is from RestrictedPython.RestrictionMutator the rest comes
# from RestrictedPython.Utilities.utility_builtins
bound_names
=
json
.
dumps
(
document
.
getBindingAssignments
().
getAssignedNamesInOrder
()
+
[
'printed'
,
'same_type'
,
'string'
,
'sequence'
,
'random'
,
'DateTime'
,
'whrandom'
,
'reorder'
,
'sets'
,
'test'
,
'math'
])
live_check_python_script
=
1
# XXX make it a preference ?
elif
document
.
meta_type
in
(
'Z SQL Method'
,
):
mode
=
'sql'
textarea_selector
=
'textarea[name="template:text"]'
elif
document
.
meta_type
in
(
'Page Template'
,
'ERP5 OOo Template'
,
):
if
'html'
in
document
.
content_type
:
mode
=
'html'
else
:
mode
=
'xml'
textarea_selector
=
'textarea[name="text:text"]'
if
not
textarea_selector
:
return
default
return
'''
<script type="text/javascript" src="%(portal_url)s/jquery/core/jquery.min.js"></script>
<script type="text/javascript" src="%(portal_url)s/ace/ace.js"></script>
<script type="text/javascript" src="%(portal_url)s/ace/mode-%(mode)s.js"></script>
<script type="text/javascript" src="%(portal_url)s/ace/ext-settings_menu.js"></script>
<script type="text/javascript" src="%(portal_url)s/ace/ext-language_tools.js"></script>
<script type="text/javascript">
$(document).ready(function() {
var textarea = $('%(textarea_selector)s');
if (textarea.length) {
$('<div id="editor">')
.css({"position": "relative", "height": textarea.height()})
.appendTo(textarea.parent());
textarea.hide();
var beforeunload_warning_set = false,
editor = ace.edit("editor"),
Mode = ace.require('ace/mode/%(mode)s').Mode;
editor.getSession().setMode(new Mode());
editor.getSession().setTabSize(2);
ace.require("ace/ext/language_tools");
editor.setOptions({ enableBasicAutocompletion: true, enableSnippets: true });
timer = 0;
function checkPythonScript() {
if (%(live_check_python_script)s) {
if (timer) {
window.clearTimeout(timer);
timer = 0;
}
timer = window.setTimeout(function() {
$.post('%(portal_url)s/ERP5Site_checkPythonScriptAsJSON',
{'data': JSON.stringify(
{ code: editor.getSession().getValue(),
bound_names: %(bound_names)s,
params: $('input[name="params"]').val() })},
function(data){
editor.getSession().setAnnotations(data.annotations);
}
)
}, 500);
}
}
editor.getSession().setValue(textarea.val());
editor.getSession().on('change', function(){
textarea.val(editor.getSession().getValue());
if (!beforeunload_warning_set) {
window.onbeforeunload = function() { return "You have unsaved changes"; };
beforeunload_warning_set = true;
}
checkPythonScript();
});
checkPythonScript();
$('input[value="Save Changes"]').click(function() {
window.onbeforeunload = function() { return; };
});
editor.commands.addCommand({
name: "save",
bindKey: {win: "Ctrl-S", mac: "Command-S"},
exec: function() {
$('input[value="Save Changes"]').click();
}
});
ace.require('ace/ext/settings_menu').init(editor);
};
});
</script>
</body>
</html>'''
%
locals
()
Navigation
.
manage_page_footer
=
manage_page_footer
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