diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/version.py b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
index be7f3b4461..870405c835 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/version.py
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/version.py
@@ -1 +1 @@
-hdx_version = 'v1.81.2'
+hdx_version = 'v1.82.0'
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/views/landing_pages.py b/ckanext-hdx_theme/ckanext/hdx_theme/views/landing_pages.py
index e394c86a5d..ecd9ffb3dc 100644
--- a/ckanext-hdx_theme/ckanext/hdx_theme/views/landing_pages.py
+++ b/ckanext-hdx_theme/ckanext/hdx_theme/views/landing_pages.py
@@ -2,7 +2,7 @@
import flask
import ckan.plugins.toolkit as tk
import ckanext.hdx_theme.helpers.faq_wordpress as fw
-from ckan.common import config
+from ckanext.hdx_theme.views.faqs import read as faq_read
from ckanext.hdx_theme.helpers.ui_constants.landing_pages.hapi import \
DATA_COVERAGE_CONSTANTS as HAPI_DATA_COVERAGE_CONSTANTS, SECTIONS_CONSTANTS as HAPI_SECTIONS_CONSTANTS
from ckanext.hdx_theme.helpers.ui_constants.landing_pages.signals import \
@@ -13,6 +13,7 @@
check_access = tk.check_access
get_action = tk.get_action
render = tk.render
+config = tk.config
log = logging.getLogger(__name__)
@@ -24,12 +25,12 @@ def hapi():
data = fw.faq_for_category(wp_category_terms)
partners = [
- ('european_comission', 'European Commission'),
('acled', 'ACLED'),
('inform', 'INFORM'),
- ('ipc', 'IPC'),
+ ('fts', 'FTS'),
('unfpa', 'UNFPA'),
('ophi', 'OPHI'),
+ ('fsnwg', 'FSNWG'),
('unchr', 'UNHCR'),
('ocha', 'OCHA'),
('wfp', 'WFP')
@@ -47,6 +48,10 @@ def hapi():
return render('landing_pages/hapi.html', extra_vars=template_data)
+def hapi_terms():
+ return faq_read('hapi-terms')
+
+
def signals():
wp_category_terms = config.get('hdx.wordpress.category.signals')
data = fw.faq_for_category(wp_category_terms)
@@ -72,5 +77,6 @@ def signals():
return render('landing_pages/signals.html', extra_vars=template_data)
-# hdx_landing_pages.add_url_rule(u'/hapi/', view_func=hapi, strict_slashes=False)
-# hdx_landing_pages.add_url_rule(u'/signals/', view_func=signals, strict_slashes=False)
+hdx_landing_pages.add_url_rule(u'/hapi/', view_func=hapi, strict_slashes=False)
+hdx_landing_pages.add_url_rule(u'/hapi/terms/', view_func=hapi_terms, strict_slashes=False)
+hdx_landing_pages.add_url_rule(u'/signals/', view_func=signals, strict_slashes=False)
diff --git a/ckanext-hdx_users/ckanext/hdx_users/views/signin.py b/ckanext-hdx_users/ckanext/hdx_users/views/signin.py
index 617c47ad90..ca91cfde99 100644
--- a/ckanext-hdx_users/ckanext/hdx_users/views/signin.py
+++ b/ckanext-hdx_users/ckanext/hdx_users/views/signin.py
@@ -1,6 +1,6 @@
from typing import Union, Any, Optional, Mapping
from urllib.parse import quote
-
+import logging
from flask import Blueprint, Response
from ckan.common import session
@@ -18,6 +18,8 @@
hdx_signin = Blueprint(u'hdx_signin', __name__, url_prefix=u'/')
+log = logging.getLogger(__name__)
+
abort = tk.abort
render = tk.render
request = tk.request
@@ -130,9 +132,11 @@ def login() -> Union[Response, str]:
session['from_login'] = True
res = next_page_or_default(next)
_remember_user_for_next_signin(res, user_obj)
+ log.warning(f'Login succeeded for: {username_or_email}')
return res
else:
extra_vars['error_message'] = _(u"Login failed. Bad username or password.")
+ log.warning(f'Login failed for: {username_or_email} . Bad username or password.')
return render("user/signin.html", extra_vars=extra_vars)
info_message_type = request.args.get('info_message_type')
diff --git a/common-config-ini.txt b/common-config-ini.txt
index a63abcbfda..9e11d09755 100644
--- a/common-config-ini.txt
+++ b/common-config-ini.txt
@@ -376,6 +376,7 @@ hdx.wordpress.category.devs=568
hdx.wordpress.category.terms=577
hdx.wordpress.category.licenses=581
hdx.wordpress.category.hapi=597
+hdx.wordpress.category.hapi-terms=599
hdx.wordpress.category.signals=595
# HDX http headers