diff --git a/app/add.py b/app/add.py index f52b51ee..af317002 100644 --- a/app/add.py +++ b/app/add.py @@ -53,13 +53,13 @@ if form.getvalue('mode') is not None: ip = "" if form.getvalue('listner') is not None: - name = "listen " + form.getvalue('listner') + name = "\nlisten " + form.getvalue('listner') backend = "" elif form.getvalue('frontend') is not None: name = "\nfrontend " + form.getvalue('frontend') backend = " default_backend " + form.getvalue('backend') + "\n" - elif form.getvalue('backend') is not None: - name = "backend " + form.getvalue('backend') + elif form.getvalue('new_backend') is not None: + name = "\nbackend " + form.getvalue('new_backend') backend = "" if form.getvalue('ssl') == "https" and form.getvalue('mode') != "tcp": diff --git a/app/servers.py b/app/servers.py index 14447f9a..779d68c5 100644 --- a/app/servers.py +++ b/app/servers.py @@ -27,7 +27,7 @@ output_from_parsed_template = template.render(title = "Servers manage", user = user, users = sql.select_users(), groups = sql.select_groups(), - servers = sql.get_dick_permit(virt=1), + servers = sql.get_dick_permit(virt=1, disable=0), roles = sql.select_roles(), masters = sql.select_servers(get_master_servers=1), sshs = sql.select_ssh(), diff --git a/app/sql.py b/app/sql.py index 73dbe0ec..61dfd33f 100644 --- a/app/sql.py +++ b/app/sql.py @@ -414,6 +414,11 @@ def get_dick_permit(**kwargs): type_ip = "" else: type_ip = "and type_ip = 0" + if kwargs.get('disable') == 0: + disable = kwargs.get('disable') + else: + disable = 1 + try: cur.execute(sql) except sqltool.Error as e: @@ -421,9 +426,9 @@ def get_dick_permit(**kwargs): else: for group in cur: if group[5] == '1': - sql = """ select * from servers where enable = 1 %s """ % type_ip + sql = """ select * from servers where enable = %s %s """ % (disable, type_ip) else: - sql = """ select * from servers where groups like '%{group}%' and enable = 1 {type_ip} """.format(group=group[5], type_ip=type_ip) + sql = """ select * from servers where groups like '%{group}%' and enable = {disable} {type_ip} """.format(group=group[5], disable=disable, type_ip=type_ip) try: cur.execute(sql) except sqltool.Error as e: @@ -494,8 +499,6 @@ def delete_ssh(id): con.close() def update_ssh(id, name, enable, group, username, password): - group = str(group) - print(group) con, cur = create_db.get_cur() sql = """ update cred set diff --git a/app/templates/add.html b/app/templates/add.html index 64a676a7..eb70e6dc 100644 --- a/app/templates/add.html +++ b/app/templates/add.html @@ -277,7 +277,7 @@ Name: - + diff --git a/app/templates/admin.html b/app/templates/admin.html index 5c4d5790..84709e2e 100644 --- a/app/templates/admin.html +++ b/app/templates/admin.html @@ -199,7 +199,7 @@ - + {% for master in masters %} {% endfor %} diff --git a/app/templates/base.html b/app/templates/base.html index 860fd200..2d228df0 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -76,7 +76,7 @@
  • HA
  • Edit config
  • -
  • Servers +
  • Servers
  • Servers
  • SSH credentials
  • diff --git a/inc/script.js b/inc/script.js index 8aa8d564..93f29bd3 100644 --- a/inc/script.js +++ b/inc/script.js @@ -379,9 +379,14 @@ $( function() { $('#time_range_out_minut1').val(minutes1); } }); - $('#time_range_out_hour').val(date1/60); + var date1_hours = Math.floor(date1/60); + var date2_hours = date1_hours + 1; + if(date1_hours <= 9) date1_hours = '0' + date1_hours; + if(date2_hours <= 9) date2_hours = '0' + date2_hours; + + $('#time_range_out_hour').val(date1_hours); $('#time_range_out_minut').val('00'); - $('#time_range_out_hour1').val(date2/60); + $('#time_range_out_hour1').val(date2_hours); $('#time_range_out_minut1').val(now.getMinutes()); $('#0').click(function() { @@ -947,4 +952,4 @@ function replace_text(id_textarea, text_var) { var end = beg + len_var var text_val = str.substring(0, beg) + str.substring(end, len); $(id_textarea).text(text_val); -} \ No newline at end of file +}