Fix: Minor fixes and improvements.

(Redmine issue: #3734)

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

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
 
 

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 %}

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(

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.
 """
 
 

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) }}

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):