ckan 2.9.11 compatibility (#72)

OpenGov-OpenData · Jul 16, 2024 · 42fafe4 · 42fafe4
1 parent 303d8b4
commit 42fafe4
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/ckanext/opendata_theme/extended_themes/bostonma/templates/header.html b/ckanext/opendata_theme/extended_themes/bostonma/templates/header.html
@@ -50,11 +50,11 @@
       {% block header_account %}
         <div class="account-masthead">
           {% block header_account_container_content %}
-            {% if c.userobj %}
-              <div class="account avatar authed" data-module="me" data-me="{{ c.userobj.id }}">
+            {% if g.userobj %}
+              <div class="account avatar authed" data-module="me" data-me="{{ g.userobj.id }}">
                 <ul class="list-unstyled unstyled">
                   {% block header_account_logged %}
-                    {% if c.userobj.sysadmin %}
+                    {% if g.userobj.sysadmin %}
                       <li>
                         <a href="{{ h.url_for(controller='admin', action='index') }}" title="{{ _('Sysadmin settings') }}">
                           <i class="fa fa-gavel" aria-hidden="true"></i>
@@ -63,9 +63,9 @@
                       </li>
                     {% endif %}
                     <li>
-                      <a href="{{ h.url_for('user.read', id=c.userobj.name) }}" class="image" title="{{ _('View profile') }}">
+                      <a href="{{ h.url_for('user.read', id=g.userobj.name) }}" class="image" title="{{ _('View profile') }}">
                               {{ h.user_image((c.user if c and c.user else ''), size=22) }}
-                              <span class="username">{{ h.opendata_theme_abbreviate_name(c.userobj.display_name) }}</span>
+                              <span class="username">{{ h.opendata_theme_abbreviate_name(g.userobj.display_name) }}</span>
                       </a>
                     </li>
                     {% set new_activities = h.new_activities() %}

diff --git a/ckanext/opendata_theme/extended_themes/bostonma/templates/page.html b/ckanext/opendata_theme/extended_themes/bostonma/templates/page.html
@@ -16,20 +16,20 @@
       <div class="side-nav-account">
         {% block header_account %}
           {% block header_account_container_content %}
-            {% if c.userobj %}
-              <div class="account avatar authed" data-module="me" data-me="{{ c.userobj.id }}">
+            {% if g.userobj %}
+              <div class="account avatar authed" data-module="me" data-me="{{ g.userobj.id }}">
                 <ul class="list-unstyled unstyled">
                   {% block header_account_logged %}
-                    {% if c.userobj.sysadmin %}
+                    {% if g.userobj.sysadmin %}
                       <li>
                         <a href="{{ h.url_for(controller='admin', action='index') }}" title="{{ _('Sysadmin settings') }}">
                           <span class="text">{{ _('Admin') }}</span>
                         </a>
                       </li>
                     {% endif %}
                     <li>
-                      <a href="{{ h.url_for('user.read', id=c.userobj.name) }}" title="{{ _('View profile') }}">
-                        <span class="username">{{ c.userobj.display_name }}</span>
+                      <a href="{{ h.url_for('user.read', id=g.userobj.name) }}" title="{{ _('View profile') }}">
+                        <span class="username">{{ g.userobj.display_name }}</span>
                       </a>
                     </li>
                     {% set new_activities = h.new_activities() %}
@@ -42,7 +42,7 @@
 
                     {% block header_account_settings_link %}
                     <li>
-                      <a href="{{ h.url_for('user.edit', id=c.userobj.name) }}" title="{{ _('Profile settings') }}">
+                      <a href="{{ h.url_for('user.edit', id=g.userobj.name) }}" title="{{ _('Profile settings') }}">
                         <span class="text">{{ _('Profile settings') }}</span>
                       </a>
                     </li>

diff --git a/ckanext/opendata_theme/extended_themes/cademo/templates/header.html b/ckanext/opendata_theme/extended_themes/cademo/templates/header.html
@@ -1,6 +1,6 @@
 {% ckan_extends %}
 {% block header_account_log_out_link %}
-  {% if c.userobj.sysadmin %}
+  {% if g.userobj.sysadmin %}
     <li>
       <a href="{{ h.url_for(controller='user', action='index') }}" title="{{ _('User List') }}">
         <i class="fa fa-users" aria-hidden="true"></i>

diff --git a/ckanext/opendata_theme/extended_themes/cnra/templates/header.html b/ckanext/opendata_theme/extended_themes/cnra/templates/header.html
@@ -1,7 +1,7 @@
 {% ckan_extends %}
 
 {% block header_account_log_out_link %}
-  {% if c.userobj.sysadmin %}
+  {% if g.userobj.sysadmin %}
     <li>
       <a href="{{ h.url_for(controller='user', action='index') }}" title="{{ _('User List') }}">
         <i class="fa fa-users" aria-hidden="true"></i>

diff --git a/ckanext/opendata_theme/extended_themes/idaho/templates/header.html b/ckanext/opendata_theme/extended_themes/idaho/templates/header.html
@@ -21,8 +21,8 @@
             </li>
           </ul>
         </div>
-        {% if c.userobj %}
-          <div class="account avatar authed" data-module="me" data-me="{{ c.userobj.id }}">
+        {% if g.userobj %}
+          <div class="account avatar authed" data-module="me" data-me="{{ g.userobj.id }}">
             <ul class="list-unstyled unstyled">
               {% block header_account_logged %}
                 <li>

diff --git a/ckanext/opendata_theme/extended_themes/sugarland/templates/compressed_header.html b/ckanext/opendata_theme/extended_themes/sugarland/templates/compressed_header.html
@@ -36,8 +36,8 @@
       {% block header_account %}
         <div class="account-masthead">
           {% block header_account_container_content %}
-            {% if c.userobj %}
-              <div class="account avatar authed" data-module="me" data-me="{{ c.userobj.id }}">
+            {% if g.userobj %}
+              <div class="account avatar authed" data-module="me" data-me="{{ g.userobj.id }}">
                 <ul class="list-unstyled unstyled">
                   {% block header_account_logged %}
                     {{ super() }}

diff --git a/ckanext/opendata_theme/opengov_custom_header/templates/compressed_header.html b/ckanext/opendata_theme/opengov_custom_header/templates/compressed_header.html
@@ -53,8 +53,8 @@
       {% block header_account %}
         <div class="account-masthead">
           {% block header_account_container_content %}
-            {% if c.userobj %}
-              <div class="account avatar authed" data-module="me" data-me="{{ c.userobj.id }}">
+            {% if g.userobj %}
+              <div class="account avatar authed" data-module="me" data-me="{{ g.userobj.id }}">
                 <ul class="list-unstyled unstyled">
                   {% block header_account_logged %}
                     {{ super() }}

diff --git a/ckanext/opendata_theme/opengov_custom_theme/templates/user/dashboard.html b/ckanext/opendata_theme/opengov_custom_theme/templates/user/dashboard.html
@@ -25,7 +25,7 @@
         {% link_for _('Profile settings'), named_route=user_edit_route, id=user.name, class_='btn btn-default', icon='cog' %}
       </div>
       <ul class="nav nav-tabs">
-        {{ h.build_nav_icon(dashboard_index_route, _('News feed')) }}
+        {{ h.build_nav_icon(dashboard_index_route, _('News feed'), offset=0) }}
         {{ h.build_nav_icon(dashboard_datasets_route, _('My Datasets')) }}
         {{ h.build_nav_icon(dashboard_organizations_route, _('My {Organizations}'.format(Organizations=org_alias_pural))) }}
         {{ h.build_nav_icon(dashboard_groups_route, _('My {Groups}'.format(Groups=group_alias_pural))) }}