Merge pull request #237 from ONLYOFFICE/develop

Release/1.1.0

web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx

@@ -215,6 +215,12 @@
         };
 
         var сonnectEditor = function () {
+            if ((config.document.fileType === "docxf" || config.document.fileType === "oform")
+                && DocsAPI.DocEditor.version().split(".")[0] < 7) {
+                innerAlert("Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online.");
+                return;
+            }
+
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
         };
 

web/documentserver-example/csharp-mvc/Views/Home/Index.aspx

@@ -66,7 +66,7 @@
                                             <a class="try-editor slide" data-type="pptx">Presentation</a>
                                         </li>
                                         <li>
-                                            <a class="try-editor form" data-type="docxf">Master form</a>
+                                            <a class="try-editor form" data-type="docxf">Form template</a>
                                         </li>
                                     </ul>
                                     <label class="create-sample">

web/documentserver-example/csharp-mvc/web.appsettings.config

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <appSettings>
   <clear />
-  <add key="version" value="1.0.0"/>
+  <add key="version" value="1.1.0"/>
 
   <add key="filesize-max" value="52428800"/>
 

web/documentserver-example/csharp/Default.aspx

@@ -68,7 +68,7 @@
                                                 <a class="try-editor slide" data-type="slide">Presentation</a>
                                             </li>
                                             <li>
-                                                <a class="try-editor form" data-type="docxf">Master form</a>
+                                                <a class="try-editor form" data-type="docxf">Form template</a>
                                             </li>
                                         </ul>
                                         <label class="create-sample">

web/documentserver-example/csharp/DocEditor.aspx

@@ -220,6 +220,12 @@
         };
 
         var сonnectEditor = function () {
+            if ((config.document.fileType === "docxf" || config.document.fileType === "oform")
+                && DocsAPI.DocEditor.version().split(".")[0] < 7) {
+                innerAlert("Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online.");
+                return;
+            }
+
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
         };
 

web/documentserver-example/csharp/settings.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <appSettings>
   <clear />
-  <add key="version" value="1.0.0"/>
+  <add key="version" value="1.1.0"/>
 
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>

web/documentserver-example/java-spring/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-server.version=1.0.0
+server.version=1.1.0
 
 server.address=127.0.0.1
 server.port=4000

web/documentserver-example/java-spring/src/main/resources/templates/editor.html

@@ -195,6 +195,12 @@
                 };
 
                 var сonnectEditor = function () {
+                    if ((config.document.fileType === "docxf" || config.document.fileType === "oform")
+                        && DocsAPI.DocEditor.version().split(".")[0] < 7) {
+                        innerAlert("Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online.");
+                        return;
+                    }
+
                     docEditor = new DocsAPI.DocEditor("iframeEditor", config);
                 };
 

web/documentserver-example/java-spring/src/main/resources/templates/index.html

@@ -55,7 +55,7 @@
                                         <a class="try-editor slide" data-type="pptx">Presentation</a>
                                     </li>
                                     <li>
-                                        <a class="try-editor form" data-type="docxf">Master form</a>
+                                        <a class="try-editor form" data-type="docxf">Form template</a>
                                     </li>
                                 </ul>
                                 <label class="create-sample">

web/documentserver-example/java/src/main/resources/settings.properties

@@ -1,4 +1,4 @@
-version=1.0.0
+version=1.1.0
 
 filesize-max=5242880
 storage-folder=app_data

web/documentserver-example/java/src/main/webapp/editor.jsp

@@ -198,6 +198,12 @@
         };
 
         var сonnectEditor = function () {
+            if ((config.document.fileType === "docxf" || config.document.fileType === "oform")
+                && DocsAPI.DocEditor.version().split(".")[0] < 7) {
+                innerAlert("Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online.");
+                return;
+            }
+
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
         };
 

web/documentserver-example/java/src/main/webapp/index.jsp

@@ -65,7 +65,7 @@
                                                 <a class="try-editor slide" data-type="pptx">Presentation</a>
                                             </li>
                                             <li>
-                                                <a class="try-editor form" data-type="docxf">Master form</a>
+                                                <a class="try-editor form" data-type="docxf">Form template</a>
                                             </li>
                                         </ul>
                                         <label class="create-sample">

web/documentserver-example/nodejs/app.js

@@ -101,9 +101,9 @@ app.get("/", function (req, res) {  // define a handler for default page
 
         res.render("index", {  // render index template with the parameters specified
             preloaderUrl: siteUrl + configServer.get('preloaderUrl'),
-            convertExts: configServer.get('convertedDocs').join(","),
-            editedExts: configServer.get('editedDocs').join(","),
-            fillExts: configServer.get("fillDocs").join(","),
+            convertExts: configServer.get('convertedDocs'),
+            editedExts: configServer.get('editedDocs'),
+            fillExts: configServer.get("fillDocs"),
             storedFiles: docManager.getStoredFiles(),
             params: docManager.getCustomParams(),
             users: users,

web/documentserver-example/nodejs/config/default.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0",
+  "version": "1.1.0",
   "log": {
     "appenders": [
       {

web/documentserver-example/nodejs/views/editor.ejs

@@ -191,6 +191,13 @@
         }
 
         var connectEditor = function () {
+
+            if ((config.document.fileType === "docxf" || config.document.fileType === "oform")
+                && DocsAPI.DocEditor.version().split(".")[0] < 7) {
+                innerAlert("Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online.");
+                return;
+            }
+
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
             fixSize();
         };

web/documentserver-example/nodejs/views/index.ejs

@@ -57,7 +57,7 @@
                                             <a class="try-editor slide reload-page" target="_blank" href="editor?fileExt=pptx<%= params %>" title="Create new presentation">Presentation</a>
                                         </li>
                                         <li>
-                                            <a class="try-editor form reload-page" target="_blank" href="editor?fileExt=docxf<%= params %>" title="Create new master form">Master form</a>
+                                            <a class="try-editor form reload-page" target="_blank" href="editor?fileExt=docxf<%= params %>" title="Create new form template">Form template</a>
                                         </li>
                                     </ul>
                                     <label class="create-sample">

web/documentserver-example/nodejs/views/wopiIndex.ejs

@@ -60,7 +60,7 @@
                                             <a class="try-editor slide reload-page" target="_blank" href="<%= serverUrl %>/wopi-new?fileExt=pptx<%= params %>" title="Create new presentation">Presentation</a>
                                         </li>
                                         <li>
-                                            <a class="try-editor form reload-page" target="_blank" href="<%= serverUrl %>/wopi-new?fileExt=docxf<%= params %>" title="Create new master form">Master form</a>
+                                            <a class="try-editor form reload-page" target="_blank" href="<%= serverUrl %>/wopi-new?fileExt=docxf<%= params %>" title="Create new form template">Form template</a>
                                         </li>
                                     </ul>
                                     <label class="create-sample">

web/documentserver-example/php/config.php

@@ -1,6 +1,6 @@
 <?php
 
-$GLOBALS['version'] = "1.0.0";
+$GLOBALS['version'] = "1.1.0";
 
 $GLOBALS['FILE_SIZE_MAX'] = 5242880;
 $GLOBALS['STORAGE_PATH'] = "";

web/documentserver-example/php/doceditor.php

@@ -506,6 +506,12 @@
                 config.events.onRequestSaveAs = onRequestSaveAs;
             };
 
+            if ((config.document.fileType === "docxf" || config.document.fileType === "oform")
+                && DocsAPI.DocEditor.version().split(".")[0] < 7) {
+                innerAlert("Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online.");
+                return;
+            }
+
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
         };
 

web/documentserver-example/php/index.php

@@ -69,7 +69,7 @@
                                                     <a class="try-editor slide reload-page" target="_blank" href="doceditor.php?fileExt=pptx&user=<?php echo htmlentities($user); ?>">Presentation</a>
                                                 </li>
                                                 <li>
-                                                    <a class="try-editor form reload-page" target="_blank" href="doceditor.php?fileExt=docxf&user=<?php echo htmlentities($user); ?>">Master form</a>
+                                                    <a class="try-editor form reload-page" target="_blank" href="doceditor.php?fileExt=docxf&user=<?php echo htmlentities($user); ?>">Form template</a>
                                                 </li>
                                             </ul>
                                             <label class="create-sample">

web/documentserver-example/python/config.py

@@ -1,6 +1,6 @@
 import os
 
-VERSION = '1.0.0'
+VERSION = '1.1.0'
 
 FILE_SIZE_MAX = 5242880
 STORAGE_PATH = 'app_data'

web/documentserver-example/python/templates/editor.html

@@ -210,6 +210,13 @@
             if (config.editorConfig.createUrl) {
                 config.events.onRequestSaveAs = onRequestSaveAs;
             };
+
+            if ((config.document.fileType === "docxf" || config.document.fileType === "oform")
+                && DocsAPI.DocEditor.version().split(".")[0] < 7) {
+                innerAlert("Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online.");
+                return;
+            }
+
             docEditor = new DocsAPI.DocEditor("iframeEditor", config);
 
             fixSize();

web/documentserver-example/python/templates/index.html

@@ -68,7 +68,7 @@
                                             <a class="try-editor slide reload-page" target="_blank" data-type="slide">Presentation</a>
                                         </li>
                                         <li>
-                                            <a class="try-editor form reload-page" target="_blank" data-type="docxf">Master form</a>
+                                            <a class="try-editor form reload-page" target="_blank" data-type="docxf">Form template</a>
                                         </li>
                                     </ul>
                                     <label class="create-sample">

web/documentserver-example/ruby/app/views/home/editor.html.erb

@@ -189,6 +189,12 @@
             config.events.onRequestSaveAs = onRequestSaveAs;
         };
 
+        if ((config.document.fileType === "docxf" || config.document.fileType === "oform")
+            && DocsAPI.DocEditor.version().split(".")[0] < 7) {
+            innerAlert("Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online.");
+            return;
+        }
+
         docEditor = new DocsAPI.DocEditor("iframeEditor", config);
     };
 

web/documentserver-example/ruby/app/views/home/index.html.erb

@@ -41,7 +41,7 @@
                         <a class="try-editor slide" data-type="pptx">Presentation</a>
                       </li>
                       <li>
-                        <a class="try-editor form" data-type="docxf">Master form</a>
+                        <a class="try-editor form" data-type="docxf">Form template</a>
                       </li>
                   </ul>
                   <label class="create-sample">

web/documentserver-example/ruby/config/application.rb

@@ -26,7 +26,7 @@ module OnlineEditorsExampleRuby
       end
     end
 
-    Rails.configuration.version="1.0.0"
+    Rails.configuration.version="1.1.0"
 
     Rails.configuration.fileSizeMax=5242880
     Rails.configuration.storagePath="app_data"