Merge pull request #6173 from OCHA-DAP/upgrade/ckan-2-10-1-small-fixes

CKAN 2.10.1 small fixes

ckan/config/middleware/flask_app.py

@@ -272,7 +272,7 @@ def make_flask_stack(conf: Union[Config, CKANConfig]) -> CKANApp:
     _register_plugins_blueprints(app)
 
     if config.get("ckan.csrf_protection.ignore_extensions"):
-        log.warn(csrf_warn_extensions)
+        # log.warn(csrf_warn_extensions)
         _exempt_plugins_blueprints_from_csrf(csrf)
 
     lib_plugins.register_package_blueprints(app)

ckanext-hdx_theme/ckanext/hdx_theme/templates/group/read_base.html

@@ -1,43 +1,43 @@
 {% extends "page.html" %}
 
-{% block subtitle %}{{ c.group_dict.display_name }}{% endblock %}
+{% block subtitle %}{{ group_dict.display_name }}{% endblock %}
 
 {% block breadcrumb_content %}
   {% snippet "snippets/other_breadcrumb_item.html", title=_('Groups'), controller='group', action='index', position=2 %}
-  <li class="breadcrumb-item active">{% link_for c.group_dict.display_name|truncate(35), controller='group', action='read', id=c.group_dict.name %}</li>
+  <li class="breadcrumb-item active">{% link_for group_dict.display_name|truncate(35), controller='group', action='read', id=group_dict.name %}</li>
 {% endblock %}
 
 {% block page_header %}
 <div class="mTop35">
   <h1 class="itemTitle">
-    {{ c.group_dict.display_name }}
+    {{ group_dict.display_name }}
   </h1>
   <span class="followButtonContainer float-end">
-    {{ h.follow_button('group', c.group_dict.id) }}
+    {{ h.follow_button('group', group_dict.id) }}
   </span>
 </div>
 <header class="module-content page-header paddingRowHack mBottom10">
   <ul class="nav nav-tabs paddingLeftHack paddingRightHack">
     {% block content_primary_nav %}
-      {{ h.bs5_build_nav_icon('group_read', _('Datasets'), class_='nav-link', id=c.group_dict.name) }}
-      {{ h.bs5_build_nav_icon('group_activity', _('Activity Stream'), id=c.group_dict.name, class_='nav-link mx-activity-stream', offset=0) }}
-      {#  {{ h.build_nav_icon('group_about', _('About'), id=c.group_dict.name) }} #}
+      {{ h.bs5_build_nav_icon('group.read', _('Datasets'), class_='nav-link', id=group_dict.name) }}
+      {{ h.bs5_build_nav_icon('activity.group_activity', _('Activity Stream'), id=group_dict.name, class_='nav-link mx-activity-stream', offset=0) }}
+      {#  {{ h.build_nav_icon('group.about', _('About'), id=group_dict.name) }} #}
     {% endblock %}
   </ul>
 </header>
 {% if self.content_action() | trim %}
   <div class="content_action">
     {% block content_action %}
-      {% if h.check_access('group_update', {'id': c.group_dict.id}) %}
-        {% link_for _('Edit'), controller='group', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %}
+      {% if h.check_access('group_update', {'id': group_dict.id}) %}
+        {% link_for _('Edit'), controller='group', action='edit', id=group_dict.name, class_='btn', icon='wrench' %}
       {% endif %}
     {% endblock %}
   </div>
 {% endif %}
 <div>
-    {% if c.group_dict.description %}
+    {% if group_dict.description %}
       <p>
-        {{ c.group_dict.description }}
+        {{ group_dict.description }}
       </p>
     {% else %}
       <p class="empty">{{ _('There is no description for this group') }}</p>
@@ -46,7 +46,7 @@ <h1 class="itemTitle">
 {% endblock %}
 
 {% block secondary_content %}
-  {% snippet "group/snippets/info.html", group=c.group_dict, show_nums=true %}
+  {% snippet "group/snippets/info.html", group=group_dict, show_nums=true %}
 {% endblock %}
 
 {% block links %}

ckanext-hdx_theme/ckanext/hdx_theme/templates/package/hdx_read.html

@@ -175,7 +175,7 @@ <h2 class="uppercase">{{_('Related Showcases')}}</h2>
           {% snippet 'package/snippets/activity_stream.html', activity_stream=hdx_activities, id=pkg.id, object_type='package' %}
           <br>
           {% if h.follow_status('dataset', pkg.name) %}
-              <span class="more mb-2">See more in <a href="{{ h.url_for('dashboard.index') }}">your dashboard</a></span>
+              <span class="more mb-2">See more in <a href="{{ h.url_for('activity.dashboard') }}">your dashboard</a></span>
           {% endif %}
         </div>
       </div>

ckanext-hdx_theme/ckanext/hdx_theme/templates/snippets/other_sidebar_links.html

@@ -1,6 +1,6 @@
 <section class="module module-narrow module-shallow license">
   <h2 class="module-heading"><i class="icon-medium fa fa-th-list"></i> {{ _('Misc') }}</h2>
       <p class="module-content">
-         <a href="{{ h.url_for('dataset_activity', _('Activity Stream'), id=pkg_dict.name) }}"><i class="fa fa-chevron-circle-left"></i> View {{ _('Activity Stream') }}</a>
+         <a href="{{ h.url_for('activity.package_activity', _('Activity Stream'), id=pkg_dict.name) }}"><i class="fa fa-chevron-circle-left"></i> View {{ _('Activity Stream') }}</a>
       </p>
     </section>

ckanext-hdx_theme/ckanext/hdx_theme/templates/user/dashboard.html

@@ -25,7 +25,7 @@ <h2 class="sspBold28 black mTop20">
     {% block page_header %}
       <header class="page-header paddingRowHack" style="position: relative;">
         <ul class="nav nav-tabs paddingLeftHack paddingRightHack">
-          {{ h.bs5_build_nav_icon('dashboard.index', _('Newsfeed'), class_='nav-link hdx-tab-button') }}
+          {{ h.bs5_build_nav_icon('activity.dashboard', _('Newsfeed'), class_='nav-link hdx-tab-button') }}
           {{ h.bs5_build_nav_icon('hdx_user_dashboard.datasets', _('My Datasets'), class_='nav-link hdx-tab-button') }}
           {{ h.bs5_build_nav_icon('dashboard.organizations', _('My Organisations'), class_='nav-link hdx-tab-button') }}
           {{ h.bs5_build_nav_icon('dashboard.groups', _('My Locations'), class_='nav-link hdx-tab-button') }}
@@ -64,7 +64,7 @@ <h2 class="sspBold28 black mTop20">
       {% block primary_content_inner %}
         <div>
           {% block activity_stream %}
-         	{% snippet 'snippets/activity_stream.html', activity_stream=dashboard_activity_stream %}
+          {% snippet 'snippets/stream.html', activity_stream=dashboard_activity_stream %}
           {% endblock %}
         </div>
       {% endblock %}

ckanext-hdx_theme/ckanext/hdx_theme/templates/user/snippets/followee_dropdown.html

@@ -25,13 +25,13 @@
     <div class="dropdown-divider"></div>
     {% if followees %}
         <li>
-          <a class="dropdown-item everything {% if context.selected_id == False %}active{% endif %}" href="{{ h.url_for('dashboard.index') }}">
+          <a class="dropdown-item everything {% if context.selected_id == False %}active{% endif %}" href="{{ h.url_for('activity.dashboard') }}">
             Everything
           </a>
         </li>
         {% for followee in followees %}
           <li>
-            <a class="dropdown-item {% if context.selected_id == followee.dict.id %}active{% endif %}" href="{{ h.url_for('dashboard.index', type=followee.type, name=followee.dict.name) }}" title="{{ followee.display_name }}">
+            <a class="dropdown-item {% if context.selected_id == followee.dict.id %}active{% endif %}" href="{{ h.url_for('activity.dashboard', type=followee.type, name=followee.dict.name) }}" title="{{ followee.display_name }}">
               {{ followee.display_name }}
             </a>
           </li>

ckanext-hdx_theme/ckanext/hdx_theme/tests/test_pages/test_page_load.py

@@ -27,7 +27,7 @@
     {'url_name': 'hdx_group.index', 'usertype': 'all'},
     {'url_name': 'hdx_org.index', 'usertype': 'all'},
     {'url_name': 'dashboard.organizations', 'usertype': 'all'},
-    {'url_name': 'dashboard.index', 'usertype': 'all'},
+    {'url_name': 'activity.dashboard', 'usertype': 'all'},
     {'url_name': 'hdx_user_dashboard.datasets', 'usertype': 'all'},
     {'url_name': 'dashboard.groups', 'usertype': 'all'},
     {'url_name': 'hdx_user_dashboard.datasets', 'usertype': 'all', 'url_params': {'id': 'tester'}},

common-config-ini.txt

@@ -182,7 +182,7 @@ ckanext.spatial.common_map.custom.url = /crisis-tiles/{z}/{x}/{y}.png
 
 ## Email settings
 
-# email_to = [email protected]
+email_to = [email protected]
 error_email_from = paste@localhost
 smtp.server = localhost
 smtp.starttls = False