diff --git a/app/create_db.py b/app/create_db.py index b373f90d..f71b1a0c 100644 --- a/app/create_db.py +++ b/app/create_db.py @@ -111,8 +111,9 @@ def default_values(): out_error(e) data_source = [ - {'name': 'admin', 'description': 'Can do everything'}, - {'name': 'editor', 'description': 'Can edit configs'}, + {'name': 'superAdmin', 'description': 'Has the highest level of administrative permissions and controls the actions of all other users'}, + {'name': 'admin', 'description': 'Has access everywhere except the Admin area'}, + {'name': 'editor', 'description': 'Has the same rights as the admin but has no access to the Servers page'}, {'name': 'guest', 'description': 'Read-only access'} ] @@ -260,7 +261,7 @@ def update_db_v_4_5_1(**kwargs): sql.append("update role set name = 'superAdmin' where id = '1';") sql.append("update role set name = 'admin', `description` = 'Has access everywhere except the Admin area' where id = '2';") sql.append("update role set id = '4' where id = '3';") - sql.append("INSERT INTO role (id, name, `description`) values('3', 'editor', 'Has the same as the admin except the Servers page');") + sql.append("INSERT INTO role (id, name, `description`) values('3', 'editor', 'Has the same as the admin except the Servers page');") sql.append("update user set role = 'superAdmin' where role = 'admin';") sql.append("update user set role = 'admin' where role = 'editor';") for i in sql: diff --git a/app/sql.py b/app/sql.py index e79bf917..8d9c35ab 100644 --- a/app/sql.py +++ b/app/sql.py @@ -11,7 +11,10 @@ def out_error(error): try: funct.logging('localhost', error, haproxywi=1, login=1) except Exception: - funct.logging('localhost', error, haproxywi=1) + try: + funct.logging('localhost', error, haproxywi=1) + except Exception: + pass print('error: '+error) diff --git a/app/templates/admin.html b/app/templates/admin.html index 35428cdb..1a01458c 100644 --- a/app/templates/admin.html +++ b/app/templates/admin.html @@ -42,7 +42,7 @@ {% else %} - {% set id = 'name-' + group.0|string() %} + {% set id = 'name-' + group.group_id|string() %} {{ input(id, value=group.name) }} @@ -124,7 +124,8 @@
Note: - For updating you have to use Roxy-WI RPM. How to start using repository read here + For updating you have to use Roxy-WI RPM or DEB. Read here + how to start using repository

If the Roxy-WI server uses a proxy to connect to the Internet, add the proxy settings to yum.conf

diff --git a/app/templates/ajax/smon_dashboard.html b/app/templates/ajax/smon_dashboard.html index 3f0b65df..72a089df 100644 --- a/app/templates/ajax/smon_dashboard.html +++ b/app/templates/ajax/smon_dashboard.html @@ -113,13 +113,13 @@ HTTP status check: {{s.http.split(':')[0]}}://{{s.ip}}:{{s.port}}{{s.http.split( {% elif s.http_status == 0 %}
- HTTP IS FAILURE + HTTP FAILURE
{% elif s.body_status == 0 %}
- BODY IS FAILURE + BODY FAILURE
{% elif s.status == 3 %} @@ -131,7 +131,7 @@ HTTP status check: {{s.http.split(':')[0]}}://{{s.ip}}:{{s.port}}{{s.http.split( {% else %}
- PORT IS DOWN + PORT DOWN
{% endif %} diff --git a/app/templates/include/admin_backup.html b/app/templates/include/admin_backup.html index e17c39e2..d94b98a3 100644 --- a/app/templates/include/admin_backup.html +++ b/app/templates/include/admin_backup.html @@ -67,6 +67,6 @@
+ Add backup

-
+
You can read the description of all parameters here
\ No newline at end of file