Merge pull request #270 from vrk-kpa/LIKA-421_fix-sentry-errors

LIKA-421: Fix xroad-stats date picker
vrk-kpa · Jun 15, 2022 · edf4f75 · edf4f75
2 parents ab5b744 + f8bc592
commit edf4f75
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/ansible/roles/ckan/files/patches/fix_bootstrap_font_path.patch b/ansible/roles/ckan/files/patches/fix_bootstrap_font_path.patch
diff --git a/ansible/roles/ckan/vars/main.yml b/ansible/roles/ckan/vars/main.yml
@@ -24,7 +24,6 @@ ckan_patches:
   - { file: "alert_fix" }
   - { file: "csrf" }
   - { file: "disable_leftover_with_capacity" }
-  - { file: "fix_bootstrap_font_path" }
   - { file: "mark_main_nav_active_on_subpages" } # https://github.com/ckan/ckan/pull/5551
   - { file: "remove_edit_button_from_slugs" }
   - { file: "remove_gravatar" }
@@ -54,4 +53,4 @@ ckan_uwsgi_conf: /etc/ckan/default/ckan-uwsgi.ini
 blocked_bots:
   - PetalBot
   - AhrefsBot
-  - SemrushBot
+  - SemrushBot
diff --git a/ckanext/ckanext-apicatalog/ckanext/apicatalog/fanstatic/javascript/datepicker.js b/ckanext/ckanext-apicatalog/ckanext/apicatalog/fanstatic/javascript/datepicker.js
@@ -0,0 +1,12 @@
+this.ckan.module('datepicker', function (jQuery, _) {
+  return {
+    initialize: function () {
+      jQuery.proxyAll(this, /_on/);
+      this.el.ready(this._onReady);
+    },
+
+    _onReady: function() {
+      var editor = $(this.el).datetimepicker();
+    }
+  }
+});
diff --git a/ckanext/ckanext-apicatalog/ckanext/apicatalog/fanstatic/webassets.yml b/ckanext/ckanext-apicatalog/ckanext/apicatalog/fanstatic/webassets.yml
@@ -75,7 +75,7 @@ datetimepicker_js:
       - base/main
   contents:
     - datetimepicker/bootstrap-datetimepicker.js
-    - datetimepicker/datepicker.js
+    - javascript/datepicker.js
 
 datetimepicker_css:
   output: ckanext-apicatalog/%(version)s_datetimepicker.css

diff --git a/ckanext/ckanext-xroad_integration b/ckanext/ckanext-xroad_integration