[Backport to 3.3.x][Fixes #9061] The UploadDatasetForm should POST "s…

…tore_spatial_files=true" when uploading (#9067) * Fixes 903 * [Fixes #9061] The UploadDatasetForm should POST "store_spatial_files=true" when uploading * [CircleCI] Fix test cases * - Update static packages * [Fixes #9061] The UploadDatasetForm should POST "store_spatial_files=true" when uploading Co-authored-by: DavidQuartz <quartzdavid@gmail.com>
GeoNode · Apr 8, 2022 · c2a6399 · c2a6399
1 parent de57e4a
commit c2a6399
Show file tree

Hide file tree

Showing 29 changed files with 3,496 additions and 2,933 deletions.
diff --git a/geonode/static/geonode/js/crop_widget/crop_widget_es5.js b/geonode/static/geonode/js/crop_widget/crop_widget_es5.js
diff --git a/geonode/static/geonode/js/messages/message_recipients_autocomplete_es5.js b/geonode/static/geonode/js/messages/message_recipients_autocomplete_es5.js
diff --git a/geonode/static/geonode/js/upload/LayerInfo.js b/geonode/static/geonode/js/upload/LayerInfo.js
@@ -251,6 +251,7 @@ define(function (require, exports) {
 			}
         }
 
+        form_data.append('store_spatial_files', true);
         form_data.append('base_file', this.main);
         form_data.append('permissions', JSON.stringify(perm));
 

diff --git a/geonode/static/gruntfile.js b/geonode/static/gruntfile.js
@@ -8,18 +8,12 @@ module.exports = function(grunt) {
   let assetsMinifiedJs = fileHandling["assets.min.js"].map (
     fileSegment => 'lib/js/' + fileSegment.substring(fileSegment.lastIndexOf('/')+1)
   );
-  let leafletPluginsMinifiedJs = fileHandling["leaflet-plugins.min.js"].map (
-    fileSegment => 'lib/js/' + fileSegment.substring(fileSegment.lastIndexOf('/')+1)
-  );
   let openlayersPluginsMinifiedJs = fileHandling["openlayers-plugins.min.js"].map(
     fileSegment => 'lib/js/' + fileSegment.substring(fileSegment.lastIndexOf('/') + 1)
   );
   let assetsMinifiedCss = fileHandling["assets.min.css"].map (
     fileSegment => 'lib/css/' + fileSegment.substring(fileSegment.lastIndexOf('/')+1)
   );
-  let leafletMinifiedCss = fileHandling["leaflet.plugins.min.css"].map (
-    fileSegment => 'lib/css/' + fileSegment.substring(fileSegment.lastIndexOf('/')+1)
-  );
   let openlayersMinifiedCss = fileHandling["openlayers.plugins.min.css"].map(
     fileSegment => 'lib/css/' + fileSegment.substring(fileSegment.lastIndexOf('/') + 1)
   );
@@ -97,7 +91,7 @@ module.exports = function(grunt) {
           nonull: true,
           cwd: 'node_modules',
           dest: 'lib/css',
-          src: [fileHandling["assets.min.css"], fileHandling["leaflet.plugins.min.css"], fileHandling["openlayers.plugins.min.css"]]
+          src: [fileHandling["assets.min.css"], fileHandling["openlayers.plugins.min.css"]]
         }, {
           expand: true,
           flatten: true,
@@ -140,7 +134,7 @@ module.exports = function(grunt) {
           nonull: true,
           cwd: 'node_modules',
           dest: 'lib/js',
-          src: [fileHandling["assets.min.js"], fileHandling.other_dependencies, fileHandling["leaflet-plugins.min.js"], fileHandling["openlayers-plugins.min.js"]]
+          src: [fileHandling["assets.min.js"], fileHandling.other_dependencies, fileHandling["openlayers-plugins.min.js"]]
         }]
       }
     },
@@ -223,7 +217,6 @@ module.exports = function(grunt) {
         },
         files: {
           'lib/css/assets.min.css': assetsMinifiedCss,
-          'lib/css/leaflet-plugins.min.css': leafletMinifiedCss,
           'lib/css/openlayers-plugins.min.css': openlayersMinifiedCss,
           'geonode/css/geonode-rtl.min.css': ['geonode/css/geonode-rtl.css']
         }
@@ -256,7 +249,6 @@ module.exports = function(grunt) {
         },
         files: {
           'lib/js/assets.min.js': assetsMinifiedJs,
-          'lib/js/leaflet-plugins.min.js': leafletPluginsMinifiedJs,
           'lib/js/openlayers-plugins.min.js': openlayersPluginsMinifiedJs
         }
       },
@@ -268,7 +260,6 @@ module.exports = function(grunt) {
         },
         files: {
           'lib/js/assets.min.js': assetsMinifiedJs,
-          'lib/js/leaflet-plugins.min.js': leafletPluginsMinifiedJs,
           'lib/js/openlayers-plugins.min.js': openlayersPluginsMinifiedJs
         }
       }

diff --git a/geonode/static/lib/css/assets.min.css b/geonode/static/lib/css/assets.min.css
diff --git a/geonode/static/lib/css/bootstrap-table.css b/geonode/static/lib/css/bootstrap-table.css
@@ -1,6 +1,6 @@
 /**
  * @author zhixin wen <wenzhixin2010@gmail.com>
- * version: 1.18.3
+ * version: 1.19.1
  * https://github.com/wenzhixin/bootstrap-table/
  */
 .bootstrap-table .fixed-table-toolbar::after {
@@ -203,6 +203,7 @@
   position: absolute;
   bottom: 0;
   width: 100%;
+  max-width: 100%;
   z-index: 1000;
   transition: visibility 0s, opacity 0.15s ease-in-out;
   opacity: 0;