From e735fbdde752e75635c9cc0ab1d132071aef6879 Mon Sep 17 00:00:00 2001
From: Jan Mach <jan.mach@cesnet.cz>
Date: Mon, 16 Jul 2018 13:36:07 +0200
Subject: [PATCH] Fix: Minor fixes and improvements.
(Redmine issue: #3734)
---
lib/hawat/base.py | 3 ++-
lib/hawat/blueprints/auth_env/__init__.py | 4 +++-
lib/hawat/blueprints/geoip/templates/geoip/search.html | 2 +-
lib/hawat/blueprints/reports/__init__.py | 2 +-
lib/hawat/blueprints/reports/forms.py | 2 +-
lib/hawat/blueprints/reports/templates/reports/search.html | 1 -
lib/hawat/blueprints/users/forms.py | 6 ++----
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/hawat/base.py b/lib/hawat/base.py
index 621bf148e..ec3ea2857 100644
--- a/lib/hawat/base.py
+++ b/lib/hawat/base.py
@@ -360,7 +360,8 @@ class HawatBaseView(flask.views.View):
"""
raise NotImplementedError()
- def can_access_endpoint(self, endpoint, item = None):
+ @staticmethod
+ def can_access_endpoint(endpoint, item = None):
"""
Check, that the current user can access given endpoint/view. This method
will also return ``False`` in case endpoint is not even registered within
diff --git a/lib/hawat/blueprints/auth_env/__init__.py b/lib/hawat/blueprints/auth_env/__init__.py
index 9d596d331..e58e17b82 100644
--- a/lib/hawat/blueprints/auth_env/__init__.py
+++ b/lib/hawat/blueprints/auth_env/__init__.py
@@ -94,11 +94,13 @@ from flask_babel import gettext, lazy_gettext, force_locale
#
# Custom modules.
#
+from mentat.datatype.sqldb import ItemChangeLogModel
+
import hawat.const
import hawat.base
import hawat.db
import hawat.forms
-from hawat.models.user import GuiUserModel, ItemChangeLogModel
+from hawat.models.user import GuiUserModel
from hawat.blueprints.auth_env.forms import RegisterUserAccountForm
diff --git a/lib/hawat/blueprints/geoip/templates/geoip/search.html b/lib/hawat/blueprints/geoip/templates/geoip/search.html
index 3caeecc27..59c857943 100644
--- a/lib/hawat/blueprints/geoip/templates/geoip/search.html
+++ b/lib/hawat/blueprints/geoip/templates/geoip/search.html
@@ -42,7 +42,7 @@
<tbody>
{%- if 'asn' in search_result['asn'] %}
<tr>
- <th>{{ gettext('ANS number:') }}</th>
+ <th>{{ gettext('ASN number:') }}</th>
<td>{{ search_result['asn']['asn'] }}</td>
</tr>
{%- endif %}
diff --git a/lib/hawat/blueprints/reports/__init__.py b/lib/hawat/blueprints/reports/__init__.py
index 36a1a1047..ca6ac2941 100644
--- a/lib/hawat/blueprints/reports/__init__.py
+++ b/lib/hawat/blueprints/reports/__init__.py
@@ -232,7 +232,7 @@ class ShowView(hawat.base.HawatItemShowView):
)
action_menu.add_entry(
'endpoint',
- 'show',
+ 'search',
endpoint = '{}.search'.format(cls.module_name)
)
action_menu.add_entry(
diff --git a/lib/hawat/blueprints/reports/forms.py b/lib/hawat/blueprints/reports/forms.py
index 77ef36f67..9bef1327a 100644
--- a/lib/hawat/blueprints/reports/forms.py
+++ b/lib/hawat/blueprints/reports/forms.py
@@ -9,7 +9,7 @@
"""
-This module contains custom internal geoip search form for Hawat.
+This module contains custom event report search form for Hawat.
"""
diff --git a/lib/hawat/blueprints/reports/templates/reports/search.html b/lib/hawat/blueprints/reports/templates/reports/search.html
index d03402089..9bef49fbe 100644
--- a/lib/hawat/blueprints/reports/templates/reports/search.html
+++ b/lib/hawat/blueprints/reports/templates/reports/search.html
@@ -24,7 +24,6 @@
{{ macros_site.render_form_item_datetime(search_form.dt_to, 'datetimepicker-hm-to') }}
</div>
</div>
- <hr>
<div class="row">
<div class="col-sm-4">
{{ macros_site.render_form_item_select(search_form.groups) }}
diff --git a/lib/hawat/blueprints/users/forms.py b/lib/hawat/blueprints/users/forms.py
index 8a9d379f9..ac23e1699 100644
--- a/lib/hawat/blueprints/users/forms.py
+++ b/lib/hawat/blueprints/users/forms.py
@@ -160,13 +160,11 @@ class AdminUserAccountForm(BaseUserAccountForm):
)
memberships = QuerySelectMultipleField(
lazy_gettext('Group memberships:'),
- query_factory = get_available_groups,
- allow_blank = True
+ query_factory = get_available_groups
)
managements = QuerySelectMultipleField(
lazy_gettext('Group managements:'),
- query_factory = get_available_groups,
- allow_blank = True
+ query_factory = get_available_groups
)
def __init__(self, *args, **kwargs):
--
GitLab