diff --git a/agent/netflow/netflow_handler.py b/agent/netflow/netflow_handler.py index f88a4ea..41c23c1 100755 --- a/agent/netflow/netflow_handler.py +++ b/agent/netflow/netflow_handler.py @@ -4,6 +4,7 @@ import sys import os from importlib import import_module + if __name__ == '__main__': if len(sys.argv) < 2: print("File name of netflow required") @@ -48,8 +49,8 @@ if __name__ == '__main__': db.close() os.system( - '/usr/bin/bash -c ' - '"%(CUR_DIR)s/djing_flow %(TMP_IPUSER_FILE)s < %(TMP_DUMP)s | ' + 'bash -c "export LD_LIBRARY_PATH=. && ' + '%(CUR_DIR)s/djing_flow %(TMP_IPUSER_FILE)s < %(TMP_DUMP)s | ' '/usr/bin/mysql -u%(DB_USER)s -h %(HOST)s -p %(DB_NAME)s --password=%(DB_PASSW)s"' % { 'CUR_DIR': cur_dir, 'TMP_IPUSER_FILE': tmp_ipuser_file, diff --git a/clientsideapp/templates/clientsideapp/index.html b/clientsideapp/templates/clientsideapp/index.html index a0ff0b2..3c9b642 100644 --- a/clientsideapp/templates/clientsideapp/index.html +++ b/clientsideapp/templates/clientsideapp/index.html @@ -1,18 +1,6 @@ {% extends 'clientsideapp/ext.html' %} {% block client_main %} -
| {% trans 'Name and comment count' %} | -{% trans 'Address' %} | -{% trans 'The nature of the damage' %} | -{% trans 'Description' %} | -{% trans 'Task author' %} | -{% trans 'Date of create' %} | -{% trans 'Actions' %} | +{% trans 'Name and comment count' %} | +{% trans 'Address' %} | +{% trans 'The nature of the damage' %} | +{% trans 'Description' %} | +{% trans 'Task author' %} | + +{% trans 'Actions' %} | {{ task.get_mode_display }} | {{ task.descr }} | -{{ task.author.username }} | ++ {% if task.author %} + {{ task.author.username }} + {% else %} + {% trans 'Not assigned' %} + {% endif %} + | {{ task.time_of_create|date:'d E H:i' }} | diff --git a/taskapp/templates/taskapp/tasklist_own.html b/taskapp/templates/taskapp/tasklist_own.html index bd12cd2..b4bc996 100644 --- a/taskapp/templates/taskapp/tasklist_own.html +++ b/taskapp/templates/taskapp/tasklist_own.html @@ -52,7 +52,7 @@ {% endif %} | {{ task.get_mode_display }} | -{{ task.descr }} | +{{ task.descr|default:'' }} | {{ task.get_state_display }} | {{ task.time_of_create|date:'d E H:i' }} |
|---|