Merge branch 'release/v4.3'

sachatrauwaen · Jul 24, 2019 · cc7a76b · cc7a76b
2 parents 89e04aa + 4b4c746
commit cc7a76b
Show file tree

Hide file tree

Showing 114 changed files with 1,673 additions and 118,519 deletions.
diff --git a/OpenContent/App_LocalResources/ShareTemplate.ascx.resx b/OpenContent/App_LocalResources/ShareTemplate.ascx.resx
@@ -153,4 +153,19 @@
   <data name="lCopyTemplates.Text" xml:space="preserve">
     <value>From Template</value>
   </data>
+  <data name="lData.Text" xml:space="preserve">
+    <value>Import Data</value>
+  </data>
+  <data name="lSettings.Text" xml:space="preserve">
+    <value>Import Settings</value>
+  </data>
+  <data name="lTemplate.Text" xml:space="preserve">
+    <value>Import Template</value>
+  </data>
+  <data name="lAdditionalData.Text" xml:space="preserve">
+    <value>Import Additional Data</value>
+  </data>
+  <data name="lBackup.Text" xml:space="preserve">
+    <value>Create Backup</value>
+  </data>
 </root>
diff --git a/OpenContent/App_LocalResources/SharedResources.resx b/OpenContent/App_LocalResources/SharedResources.resx
@@ -136,7 +136,7 @@
     <value>Based On Template From</value>
   </data>
   <data name="liCreateNewTemplate.Text" xml:space="preserve">
-    <value>Create a new template</value>
+    <value>Create New Template Folder</value>
   </data>
   <data name="liFromSite.Text" xml:space="preserve">
     <value>Site</value>
@@ -151,7 +151,7 @@
     <value>This module</value>
   </data>
   <data name="liUseExistingTemplate.Text" xml:space="preserve">
-    <value>Use a existing template</value>
+    <value>Use Existing Template</value>
   </data>
   <data name="lTemplate.Text" xml:space="preserve">
     <value>Template</value>

diff --git a/OpenContent/Components/Alpaca/AlpacaEngine.cs b/OpenContent/Components/Alpaca/AlpacaEngine.cs
@@ -161,12 +161,12 @@ private void RegisterFields(bool bootstrap)
                 string apikey = App.Services.CreateGlobalSettingsRepository(PortalId).GetGoogleApiKey();
                 ClientResourceManager.RegisterScript(Page, "//maps.googleapis.com/maps/api/js?v=3.exp&libraries=places" + (string.IsNullOrEmpty(apikey) ? "" : "&key=" + apikey), FileOrder.Js.DefaultPriority);
             }
-            if (allFields || fieldTypes.ContainsAny("imagecropper", "imagecrop", "imagecrop2", "imagex"))
+            if (allFields || fieldTypes.ContainsAny("imagecropper", "imagecrop", "imagecrop2", "imagex", "mlimagex"))
             {
                 ClientResourceManager.RegisterScript(Page, "~/DesktopModules/OpenContent/js/cropper/cropper.js", FileOrder.Js.DefaultPriority);
                 ClientResourceManager.RegisterStyleSheet(Page, "~/DesktopModules/OpenContent/js/cropper/cropper.css", FileOrder.Css.DefaultPriority);
             }
-            if (allFields || fieldTypes.ContainsAny("select2", "image2", "file2", "url2", "mlimage2", "mlfile2", "mlurl2", "mlfolder2", "imagecrop2", "role2", "user2", "imagex"))
+            if (allFields || fieldTypes.ContainsAny("select2", "image2", "file2", "url2", "mlimage2", "mlfile2", "mlurl2", "mlfolder2", "imagecrop2", "role2", "user2", "imagex", "mlimagex"))
             {
                 ClientResourceManager.RegisterScript(Page, "~/DesktopModules/OpenContent/js/select2/select2.js", FileOrder.Js.DefaultPriority);
                 ClientResourceManager.RegisterStyleSheet(Page, "~/DesktopModules/OpenContent/js/select2/select2.css", FileOrder.Css.DefaultPriority);

diff --git a/OpenContent/Components/Datasource/OpenContentDataSource.cs b/OpenContent/Components/Datasource/OpenContentDataSource.cs
@@ -290,6 +290,7 @@ public virtual void Add(DataSourceContext context, JToken data)
                 LuceneController.Instance.Add(content, indexConfig);
                 LuceneController.Instance.Commit();
             }
+            ClearUrlRewriterCache(context);
             Notify(context, data, "add");
         }
         public virtual void Update(DataSourceContext context, IDataItem item, JToken data)