fixed opt. ssl error on http_import (req by DESY)

zms-publishing · Apr 3, 2021 · 6101571 · 6101571
1 parent 74d5b8d
commit 6101571
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 26 deletions.
diff --git a/ZMSFormulator/standard_html.zpt b/ZMSFormulator/standard_html.zpt
@@ -1,29 +1,47 @@
 <!-- ZMSFormulator.standard_html -->
 
-<tal:block tal:define="global this options/zmscontext">
-<style>
-#editor_holder .checkbox {
-  line-height: normal;
-}
-#editor_holder h3 {
-  display: none;
-}
-#editor_holder label.control-label {
-  white-space: normal;
-}
-button {
-  font-family: FrutigerLTW02-45Light,Arial,Helvetica,sans-serif;
-}
-#editor_holder div[data-schemapath*="TEXTAREA"] label,
-#editor_holder div[data-schemapath*="TEXTAREA"] input {
-   display:none;
-}
-</style>
-<div tal:attributes="class python:this.REQUEST.get('tmpl','portal_or_oe')!='portal_or_oe' and 'col-lg-8 col-lg-offset-3 col-md-10 col-md-offset-1' or ''" tal:omit-tag="python:this.REQUEST.get('tmpl','portal_or_oe')=='subwebsite'">
-  <h1 tal:content="structure python:this.getTitle(request)" tal:condition="python:this.REQUEST.get('tmpl','portal_or_oe')!='subwebsite'">title</h1>
-  <p tal:condition="python:this.attr('attr_dc_description') and this.REQUEST.get('tmpl','portal_or_oe')!='subwebsite'" tal:content="python:this.attr('attr_dc_description')" class="lead">attr_dc_description</p>
-  <tal:block tal:content="structure python:this.getJSONEditor()"></tal:block>
-</div>
+<div class="ZMSFormulator" 
+	tal:define="global this options/zmscontext">
+	<style>
+		#editor_holder .checkbox {
+			line-height: normal;
+		}
+		#editor_holder h3 {
+			display: none;
+		}
+		#editor_holder label.control-label {
+			white-space: normal;
+		}
+		button {
+			font-family: FrutigerLTW02-45Light,Arial,Helvetica,sans-serif;
+		}
+		#editor_holder div[data-schemapath*="TEXTAREA"] label,
+		#editor_holder div[data-schemapath*="TEXTAREA"] input {
+			display:none;
+		}
+		#valid_indicator {
+			height: 50px;
+			line-height: 50px;
+			display: inline-block;
+			vertical-align: top;
+			font-weight: bold;
+		}
+		.row.has-error label,
+		.row.has-error input,
+		.row.has-error textarea {
+			color:red
+		} 
+		.row.has-error input,
+		.row.has-error textarea {
+			background-color:rgb(255 0 0 / 0.15);
+			border-color:red
+		}
+	</style>
+	<div tal:attributes="class python:this.REQUEST.get('tmpl','portal_or_oe')!='portal_or_oe' and 'col-lg-8 col-lg-offset-3 col-md-10 col-md-offset-1' or ''" tal:omit-tag="python:this.REQUEST.get('tmpl','portal_or_oe')=='subwebsite'">
+		<h1 tal:content="structure python:this.getTitle(request)" tal:condition="python:this.REQUEST.get('tmpl','portal_or_oe')!='subwebsite'">title</h1>
+		<p tal:condition="python:this.attr('attr_dc_description') and this.REQUEST.get('tmpl','portal_or_oe')!='subwebsite'" tal:content="python:this.attr('attr_dc_description')" class="lead">attr_dc_description</p>
+		<tal:block tal:content="structure python:this.getJSONEditor()"></tal:block>
+	</div>
 </tal:block>
 
 <!-- /ZMSFormulator.standard_html -->
diff --git a/zms3.formulator.lib/JSONEditor.py b/zms3.formulator.lib/JSONEditor.py
@@ -165,8 +165,9 @@ def __init__(self, obj):
   def render(self, obj):
 
     script = '<script src="%s/metaobj_manager/zms3.formulator.lib.jsoneditor.min.js"></script>\n<script>%s</script>'
-    editor = standard.http_import(obj.this, obj.this.getMetaobjManager().absolute_url() + '/zms3.formulator.lib.jsoneditor.custom.js')
-    editor = editor % (self.getLangDict(obj), obj.thisURLPath,
+    # editor = standard.http_import(obj.this, obj.this.getMetaobjManager().absolute_url() + '/zms3.formulator.lib.jsoneditor.custom.js')
+    editor = obj.this.content.metaobj_manager.evalMetaobjAttr('zms3.formulator.lib','jsoneditor.custom.js',options={})
+    editor = str(editor) % (self.getLangDict(obj), obj.thisURLPath,
                        obj.this.REQUEST.get('lang'), obj.GoogleAPIKey, 
                        obj.options, self.mandatory_validators, obj.onReady,
                        obj.thisURLPath, obj.onChange)