Merge branch 'hotfix/https'

sachatrauwaen · sachatrauwaen · commit 5944dc24d10c · 2018-10-15T19:21:56.000+02:00
diff --git a/EditSettings.ascx b/EditSettings.ascx
@@ -90,7 +90,7 @@
                             "schema": config.schema,
                             "options": config.options,
                             "data": config.data,
-                            "view": "dnn-edit",
+                            "view": "dnnbootstrap-edit",
                             "connector": connector,
                             "postRender": function (control) {
                             }
diff --git a/EditSettings.ascx.cs b/EditSettings.ascx.cs
@@ -30,7 +30,7 @@ protected override void OnInit(EventArgs e)
             //ServicesFramework.Instance.RequestAjaxScriptSupport();
             //ServicesFramework.Instance.RequestAjaxAntiForgerySupport();
             AlpacaEngine alpaca = new AlpacaEngine(Page, ModuleContext.PortalId, "DesktopModules/OpenForm/", "settings");
-            alpaca.RegisterAll();
+            alpaca.RegisterAll(true, true);
         }
 
         protected override void OnLoad(EventArgs e)
diff --git a/EditSettings.ascx.designer.cs b/EditSettings.ascx.designer.cs
diff --git a/OpenForm.dnn b/OpenForm.dnn
@@ -1,8 +1,8 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="OpenForm" type="Module" version="03.03.01">
+    <package name="OpenForm" type="Module" version="03.04.00">
       <friendlyName>OpenForm</friendlyName>
-      <description>OpenForm module. Requires OpenContent v3.2.x</description>
+      <description>OpenForm module. Requires OpenContent v3.4.5 or higher</description>
       <iconFile>~/Images/icon_extensions.png</iconFile>
       <owner>
         <name>Satrabel.be</name>
diff --git a/View.ascx b/View.ascx
@@ -8,6 +8,7 @@
 <dnncl:DnnJsInclude ID="DnnJsInclude3" runat="server" FilePath="~/DesktopModules/OpenContent/js/lib/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js" Priority="109" ForceProvider="DnnPageHeaderProvider" />
 <dnncl:DnnCssInclude ID="DnnCssInclude4" runat="server" FilePath="~/DesktopModules/OpenContent/js/lib/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css" />
 <dnncl:DnnJsInclude ID="DnnJsInclude5" runat="server" FilePath="~/DesktopModules/OpenContent/alpaca/js/fields/dnn/DateField.js" Priority="110" ForceProvider="DnnPageHeaderProvider" />
+<dnncl:DnnJsInclude ID="DnnJsInclude6" runat="server" FilePath="~/DesktopModules/OpenContent/alpaca/js/fields/dnn/CheckboxField.js" Priority="110" ForceProvider="DnnPageHeaderProvider" />
            
 <dnncl:DnnCssInclude ID="DnnCssInclude1" runat="server" FilePath="~/DesktopModules/OpenContent/js/summernote/summernote.css" />
 <dnncl:DnnJsInclude ID="DnnJsInclude10" runat="server" FilePath="~/DesktopModules/OpenContent/js/summernote/summernote.js" Priority="113" ForceProvider="DnnPageHeaderProvider" />
@@ -44,7 +45,8 @@
         </div>
         <span class="ResultMessage"></span>
         <div class="ResultTracking"></div>
-        <asp:HiddenField ID="hfOpenForm" runat="server" />
+        <asp:HiddenField ID="hfOpenForm" runat="server" />        
+        <input type="hidden" name="__OPENFORM<%=ModuleId %>" id="__OPENFORM<%=ModuleId %>" value="" />
     </asp:Panel>
 
     <script type="text/javascript">
@@ -96,6 +98,7 @@
                                 if (selfControl.isValid(true) && (!recaptcha || recap.length > 0)) {
                                     var value = selfControl.getValue();
                                     $('#<%=hfOpenForm.ClientID %>').val(JSON.stringify(value));
+                                    $('#__OPENFORM<%=ModuleId %>').val(JSON.stringify(value));
                                     if (recaptcha) {
                                         value.recaptcha = recap;
                                     }
@@ -110,7 +113,7 @@
 
                                     });
                                     fd.append("data", JSON.stringify(value));
-                                    self.FormSubmit(fd);
+                                    self.FormSubmit(fd, value);
                                     $(document).trigger("postSubmit.openform", [value, <%=ModuleId %>, sf]);
                                 }
                             });
@@ -123,7 +126,7 @@
                 //alert("Uh-oh, something broke: " + status);
             });
 
-            self.FormSubmit = function (formdata) {
+            self.FormSubmit = function (formdata, value) {
                 $.ajax({
                     type: "POST",
                     url: sf.getServiceRoot('OpenForm') + "OpenFormAPI/Submit",
@@ -136,7 +139,11 @@
                         console.log(data.Errors);
                     }
                     if (data.Tracking || data.AfterSubmit) {
+                        //var jsonData = JSON.stringify(value);
                         <%= PostBackStr() %>
+                        //WebForm_DoPostBackWithOptions(new WebForm_PostBackOptions("dnn$ctr472$View$lbSave", jsonData, false, "", "http://localhost:54068/fr-fr/openform/result/submit", false, true))
+
+                        //window.location = window.location + "/submit/" + encodeURIComponent(JSON.stringify(value));
                     } else {
                         $('.OpenForm', moduleScope).hide();
                         $('.ResultMessage', moduleScope).html(data.Message);
diff --git a/View.ascx.cs b/View.ascx.cs
@@ -67,7 +67,7 @@ protected override void OnLoad(EventArgs e)
                     OpenFormController ctrl =new OpenFormController();
                     var content = ctrl.GetContent(id, ModuleId);
                      */
-                    string json = hfOpenForm.Value;
+                    string json = Request["__OPENFORM"+ModuleId];
                     phForm.Visible = false;
                     phResult.Visible = true;
                     string formData = "";
@@ -138,8 +138,6 @@ private void InitForm(string template)
                 scriptList.Items.AddRange(OpenFormUtils.GetTemplatesFiles(PortalSettings, ModuleId, template).ToArray());
                 scriptList.Visible = true;
             }
-
-
             if (string.IsNullOrEmpty(template))
             {
                 ScopeWrapper.Visible = false;
diff --git a/View.ascx.designer.cs b/View.ascx.designer.cs
diff --git a/js/builder/formbuilder.js b/js/builder/formbuilder.js
@@ -273,7 +273,7 @@ var baseFields = function (index, value, oldOptions) {
         });
     }
     if (value.fieldtype == "checkbox") {
-        field.label = value.title;
+        field.rightLabel = value.title;
     }
     if (value.fieldtype == "radio") {
         field.vertical = value.vertical;
@@ -664,10 +664,11 @@ var fieldOptions =
             maxHeight: null,
             focus: true,
             toolbar: [
-                ['style', ['bold', 'italic', 'underline', 'clear']],                
+                ['style', ['bold', 'underline', 'clear']],                
                 ['fontsize', ['fontsize']],
                 ['color', ['color']],
-                ['para', ['ul', 'ol', 'paragraph']]
+                ['para', ['ul', 'ol', 'paragraph']],
+                ['insert', ['link']]
             ]
         }
     },
diff --git a/settings-options.json b/settings-options.json

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@`
`90`	`90`	`"schema": config.schema,`
`91`	`91`	`"options": config.options,`
`92`	`92`	`"data": config.data,`
`93`		`- "view": "dnn-edit",`
	`93`	`+ "view": "dnnbootstrap-edit",`
`94`	`94`	`"connector": connector,`
`95`	`95`	`"postRender": function (control) {`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ protected override void OnInit(EventArgs e)`
`30`	`30`	`//ServicesFramework.Instance.RequestAjaxScriptSupport();`
`31`	`31`	`//ServicesFramework.Instance.RequestAjaxAntiForgerySupport();`
`32`	`32`	`AlpacaEngine alpaca = new AlpacaEngine(Page, ModuleContext.PortalId, "DesktopModules/OpenForm/", "settings");`
`33`		`- alpaca.RegisterAll();`
	`33`	`+ alpaca.RegisterAll(true, true);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`protected override void OnLoad(EventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ var baseFields = function (index, value, oldOptions) {`
`273`	`273`	`});`
`274`	`274`	`}`
`275`	`275`	`if (value.fieldtype == "checkbox") {`
`276`		`- field.label = value.title;`
	`276`	`+ field.rightLabel = value.title;`
`277`	`277`	`}`
`278`	`278`	`if (value.fieldtype == "radio") {`
`279`	`279`	`field.vertical = value.vertical;`
`@@ -664,10 +664,11 @@ var fieldOptions =`
`664`	`664`	`maxHeight: null,`
`665`	`665`	`focus: true,`
`666`	`666`	`toolbar: [`
`667`		`- ['style', ['bold', 'italic', 'underline', 'clear']],`
	`667`	`+ ['style', ['bold', 'underline', 'clear']],`
`668`	`668`	`['fontsize', ['fontsize']],`
`669`	`669`	`['color', ['color']],`
`670`		`- ['para', ['ul', 'ol', 'paragraph']]`
	`670`	`+ ['para', ['ul', 'ol', 'paragraph']],`
	`671`	`+ ['insert', ['link']]`
`671`	`672`	`]`
`672`	`673`	`}`
`673`	`674`	`},`