github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v3.2.3 

Bugs
pull/42/head
Aidaho12 2018-08-31 11:42:44 +06:00
parent da4d9355d7
commit f0564e4744
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/create_db.py
View File

@ -527,7 +527,7 @@ def update_db_v_3(**kwargs):
def update_db_v_31(**kwargs):
con, cur = get_cur()
sql = [ "ALTER TABLE `settings` ADD COLUMN `desc` varchar(64); ",
sql = [ "ALTER TABLE `settings` ADD COLUMN `desc` varchar(100); ",
"INSERT INTO settings (param, value, section, `desc`) values('time_zone', 'UTC', 'main', 'Time Zone');",
"INSERT INTO settings (param, value, section, `desc`) values('proxy', '', 'main', 'Proxy server. Use proto://ip:port');",
"INSERT INTO settings (param, value, section, `desc`) values('session_ttl', '5', 'main', 'Time to live users sessions. In days');",

2
app/options.py
View File

@ -313,7 +313,7 @@ if serv is not None and form.getvalue('right') is not None:
right = form.getvalue('right')
hap_configs_dir = funct.get_config_var('configs', 'haproxy_save_configs_dir')
cmd='diff -ub %s%s %s%s' % (hap_configs_dir, left, hap_configs_dir, right)
env = Environment(loader=FileSystemLoader('templates/ajax'),extensions=['jinja2.ext.loopcontrols'])
env = Environment(loader=FileSystemLoader('templates/ajax'),extensions=['jinja2.ext.loopcontrols', "jinja2.ext.do"])
template = env.get_template('compare.html')
output, stderr = funct.subprocess_execute(cmd)

15
app/templates/ajax/compare.html
View File

@ -1,8 +1,8 @@
</center>
<div class="out">
<div class="diff">
{% set plus = 0 %}
{% set minus = 0 %}
{% set plus = [] %}
{% set minus = [] %}
{% set total_change = 0 %}
{% for line in stdout %}
@ -12,20 +12,19 @@
{{ line }}</div>
{% elif line.startswith('-') and loop.index0 > 1 %}
<div class="lineDiffMinus">{{ line }}</div>
{% set minus = minus + 1 %}
{% do minus.append(1) %}
{% elif line.startswith('+') and loop.index0 > 2 %}
<div class="lineDiffPlus">{{ line }}</div>
{% set plus = plus + 1 %}
{% do plus.append(1) %}
{% elif line.startswith('@') %}
<div class="lineDog">{{ line }}</div>
{% else %}
<div class="lineDiff">{{ line }}</div>
{% endif %}
{% set total_change = minus + plus %}
{% if loop.last %}
<div class="diffHead">Total change: {{ total_change }}, additions: {{ plus }} & deletions: {{ minus }} </div>
{% endif %}
{% endfor %}
{% set total_change = minus + plus %}
<div class="diffHead">Total change: {{ total_change|length }}, additions: {{ plus|length }} & deletions: {{ minus|length }} </div>
</div>
</div>