remove include_deleted datasets as it's not working, css fixes

DataShades · Jul 26, 2024 · 34fa166 · 34fa166
1 parent c726ace
commit 34fa166
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 4 deletions.
diff --git a/ckanext/bulk/assets/scss/elements/_forms.scss b/ckanext/bulk/assets/scss/elements/_forms.scss
@@ -2,6 +2,19 @@
 @use "utils" as u;
 @use "variables" as v;
 
+.primary {
+    .bulk-manager {
+        label.form-label {
+           float: unset;
+           width: unset;
+        }
+
+        .controls  {
+            margin-left: 0;
+        }
+    }
+}
+
 .toggle-switch {
     label {
         background-color: white;

diff --git a/ckanext/bulk/assets/scss/elements/_progressbar.scss b/ckanext/bulk/assets/scss/elements/_progressbar.scss
@@ -1,4 +1,7 @@
 .bulk-progress-bar {
+    position: relative;
+    margin-bottom: 1rem;
+
     #pb-runner-wrapper {
         width: 100%;
         background: #e2e2e2;

diff --git a/ckanext/bulk/assets/styles/bulk.css b/ckanext/bulk/assets/styles/bulk.css
diff --git a/ckanext/bulk/entity_manager.py b/ckanext/bulk/entity_manager.py
@@ -203,7 +203,6 @@ def search_entities_by_filters(
                     "start": start,
                     "include_private": True,
                     "include_drafts": True,
-                    "include_deleted": True,
                 },
             )
 

diff --git a/ckanext/bulk/templates/bulk/manager_form.html b/ckanext/bulk/templates/bulk/manager_form.html
@@ -7,7 +7,7 @@
 
     <div class="form-group toggle-switch">
         <input type="checkbox" checked="checked" id="global_operator" name="global_operator" value="global_operator">
-        <label for="global_operator" class="container">
+        <label for="global_operator">
             {% snippet 'bulk/snippets/svg/magnifier.svg' %}
             {{_("Global operator:") }}
             <div class="action">

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = ckanext-bulk
-version = 0.1.0
+version = 0.1.1
 description = Bulk update for CKAN datasets/resources
 long_description = file: README.md
 long_description_content_type = text/markdown