Merge pull request #5147 from Zharktas/refactor_broken_bulk_process_layout

smotornyuk · web-flow · commit f3cb180e34a2 · 2020-01-17T12:51:29.000+02:00
Fix broken layout in organization bulk_process
diff --git a/ckan/templates/organization/bulk_process.html b/ckan/templates/organization/bulk_process.html
@@ -9,7 +9,7 @@
 {% block primary_content_inner %}
   <div class="row">
     <h1 class="hide-heading">{{ _('Edit datasets') }}</h1>
-    <div class="primary col-md-8">
+    <div class="primary col-md-12">
       <h3 class="page-heading">
         {% block page_heading %}
           {%- if page.item_count -%}
@@ -21,6 +21,16 @@ <h3 class="page-heading">
           {%- endif -%}
         {% endblock %}
       </h3>
+
+      {% block search_form %}
+        {% set sorting = [
+            (_('Name Ascending'), 'title_string asc'),
+            (_('Name Descending'), 'title_string desc'),
+            (_('Last Modified'), 'data_modified desc') ]
+                %}
+        {% snippet 'snippets/search_form.html', form_id='organization-datasets-search-form', type='dataset', query=q, count=page.item_count, sorting=sorting, sorting_selected=sort_by_selected, no_title=true, search_class=' ' %}
+      {% endblock %}
+
       {% block form %}
         {% if page.item_count %}
           <form method="POST" data-module="basic-form">
@@ -89,24 +99,13 @@ <h3 class="dataset-heading">
         {% endif %}
       {% endblock %}
     </div>
-    <aside class="tertiary col-md-4">
-      {% block tertiary_content %}
-
-        {% block search_form %}
-          {% set sorting = [
-            (_('Name Ascending'), 'title_string asc'),
-            (_('Name Descending'), 'title_string desc'),
-            (_('Last Modified'), 'data_modified desc') ]
-          %}
-          {% snippet 'snippets/search_form.html', form_id='organization-datasets-search-form', type='dataset', query=q, count=page.item_count, sorting=sorting, sorting_selected=sort_by_selected, no_title=true, search_class=' ' %}
-        {% endblock %}
-
-        {#{% snippet 'snippets/simple_search.html', q=q, sort=sort_by_selected, placeholder=_('Search datasets...'), extra_sort=[(_('Last Modified'), 'data_modified asc')], input_class='search-normal', form_class='search-aside' %}#}
-        {% for facet in facet_titles %}
-          {{ h.snippet('snippets/facet_list.html', title=facet_titles[facet], name=facet, extras={'id':group_dict.id}) }}
-        {% endfor %}
-      {% endblock %}
-    </aside>
   </div>
   {{ page.pager() }}
 {% endblock %}
+
+{% block secondary_content %}
+    {{  super() }}
+    {% for facet in c.facet_titles %}
+    {{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet, extras={'id':group_dict.id}) }}
+  {% endfor %}
+{% endblock %}
diff --git a/ckan/tests/controllers/test_organization.py b/ckan/tests/controllers/test_organization.py
@@ -297,7 +297,7 @@ def test_make_private(self, app):
         self.organization = factories.Organization(user=self.user)
 
         datasets = [
-            factories.Dataset(owner_org=self.organization["id"])
+            factories.Dataset(owner_org=self.organization["id"], private=False)
             for i in range(0, 5)
         ]
         response = app.get(
@@ -306,7 +306,7 @@ def test_make_private(self, app):
             ),
             extra_environ=self.user_env,
         )
-        form = response.forms[1]
+        form = response.forms[2]
         for v in form.fields.values():
             try:
                 v[0].checked = True
@@ -338,7 +338,7 @@ def test_make_public(self, app):
             ),
             extra_environ=self.user_env,
         )
-        form = response.forms[1]
+        form = response.forms[2]
         for v in form.fields.values():
             try:
                 v[0].checked = True
@@ -369,7 +369,7 @@ def test_delete(self, app):
             ),
             extra_environ=self.user_env,
         )
-        form = response.forms[1]
+        form = response.forms[2]
         for v in form.fields.values():
             try:
                 v[0].checked = True
