5.0.0.0

Changelog: https://haproxy-wi.org/changelog.py#5_0)

app/sql.py

@@ -2428,7 +2428,10 @@ def select_geoip_country_codes():
 
 def add_provider_do(provider_name, provider_group, provider_token):
 	con, cur = get_cur()
-	sql = """ insert into providers_creds (name, type, `group`, key) values ('%s', 'do', '%s', '%s')""" % (provider_name, provider_group, provider_token)
+	if mysql_enable == '1':
+		sql = """ insert into providers_creds (name, type, `group`, key, create_date, edit_date) values ('%s', 'do', '%s', '%s', now(), now())""" % (provider_name, provider_group, provider_token)
+	else:
+		sql = """ insert into providers_creds (name, type, `group`, key, create_date, edit_date) values ('%s', 'do', '%s', '%s', datetime('now', 'localtime'), datetime('now', 'localtime'))""" % (provider_name, provider_group, provider_token)
 
 	try:
 		cur.execute(sql)
@@ -2443,7 +2446,11 @@ def add_provider_do(provider_name, provider_group, provider_token):
 
 def add_provider_aws(provider_name, provider_group, provider_key, provider_secret):
 	con, cur = get_cur()
-	sql = """ insert into providers_creds (name, type, `group`, key, secret) values ('%s', 'aws', '%s', '%s', '%s')""" % (provider_name, provider_group, provider_key, provider_secret)
+
+	if mysql_enable == '1':
+		sql = """ insert into providers_creds (name, type, `group`, key, secret, create_date, edit_date) values ('%s', 'aws', '%s', '%s', '%s', now(), now())""" % (provider_name, provider_group, provider_key, provider_secret)
+	else:
+		sql = """ insert into providers_creds (name, type, `group`, key, secret, create_date, edit_date) values ('%s', 'aws', '%s', '%s', '%s', datetime('now', 'localtime'), datetime('now', 'localtime'))""" % (provider_name, provider_group, provider_key, provider_secret)
 
 	try:
 		cur.execute(sql)
@@ -2756,10 +2763,19 @@ def select_do_provider(provider_id):
 
 def update_do_provider(new_name, new_token, provider_id):
 	con, cur = get_cur()
-	sql = """ update providers_creds set 
+
-				name = '%s',
+	if mysql_enable == '1':
-				key = '%s'
+		sql = """ update providers_creds set 
-				where id = '%s'  """ % (new_name, new_token, provider_id)
+					name = '%s',
+					key = '%s',
+					edit_date = now()
+					where id = '%s'  """ % (new_name, new_token, provider_id)
+	else:
+		sql = """ update providers_creds set 
+					name = '%s',
+					key = '%s',
+					edit_date = datetime('now', 'localtime')
+					where id = '%s'  """ % (new_name, new_token, provider_id)
 
 	try:
 		cur.execute(sql)
@@ -2776,11 +2792,21 @@ def update_do_provider(new_name, new_token, provider_id):
 
 def update_aws_provider(new_name, new_key, new_secret, provider_id):
 	con, cur = get_cur()
-	sql = """ update providers_creds set 
+
-				name = '%s',
+	if mysql_enable == '1':
-				key = '%s',
+		sql = """ update providers_creds set 
-				secret = '%s'
+						name = '%s',
-				where id = '%s'  """ % (new_name, new_key, new_secret, provider_id)
+						key = '%s',
+						secret = '%s',
+						edit_date = now()
+						where id = '%s'  """ % (new_name, new_key, new_secret, provider_id)
+	else:
+		sql = """ update providers_creds set 
+					name = '%s',
+					key = '%s',
+					secret = '%s',
+					edit_date = datetime('now', 'localtime')
+					where id = '%s'  """ % (new_name, new_key, new_secret, provider_id)
 
 	try:
 		cur.execute(sql)

app/templates/ajax/provisioning/providers.html

@@ -1,7 +1,7 @@
 {% for p in providers %}
 <tr id="provider-{{p.0}}" class="{{ loop.cycle('odd', 'even') }} {% if adding %}newprovider{% endif %}">
     <td class="padding10 first-collumn"><span id="provider-name-{{p.0}}">{{p.1}}</span></td>
-    <td style="width: {% if role != 1 %}100{% else %} 10{% endif %}%;">
+    <td style="width: 10%">
         <span id="provider-type-{{p.0}}">
         {% if p.2 == 'do' %}
             DigitalOcean
@@ -13,7 +13,7 @@
         </span>
     </td>
     {% if role == 1 %}
-     <td style="width: 100%">
+    <td style="width: 10%">
         {% for g in groups %}
             {% if adding %}
             {% if user_group|int() == g.0|int() %}
@@ -25,15 +25,17 @@
             {% endif %}
             {% endif %}
         {% endfor %}
-     </td>
+    </td>
-     {% else %}
+    {% else %}
         <span id="provider-group-{{p.0}}" style="display: none;">user_group</span>
-     {% endif %}
+    {% endif %}
-     <td>
+    <td id="provider-created-date-{{p.0}}" style="width: 15%">{{p.6}}</td>
+    <td id="provider-edited-date-{{p.0}}" style="width: 100%">{{p.7}}</td>
+    <td>
 	    <a class="edit" onclick="{{onclickEditAction}}({{p.0}})" title="Edit provider {{p.1}}" style="cursor: pointer;"></a>
-	 </td>
+	</td>
-	 <td>
+	<td>
 	    <a class="delete" onclick="confirmDeleteProvider({{p.0}})" title="Delete provider {{p.1}}" style="cursor: pointer;"></a>
-	 </td>
+	</td>
 </tr>
 {% endfor %}

app/templates/ajax/provisioning/provisioned_servers.html

@@ -1,7 +1,7 @@
 {% for s in servers %}
 <tr id="server-{{s.0}}" class="{{ loop.cycle('odd', 'even') }} {% if adding %}newserver{% endif %}">
     <td class="padding10 first-collumn"><span id="server-name-{{s.0}}">{{s.1}}</span></td>
-    <td>
+    <td style="width: 10%">
         {% for p in providers %}
             {% if p.0|int() == s.2|int() %}
 		        <span>{{ p.1 }}</span>
@@ -10,7 +10,7 @@
         {% endfor %}
      </td>
     {% if role == 1 %}
-     <td>
+     <td style="width: 10%">
         {% for g in groups %}
             {% if adding %}
             {% if user_group|int() == g.0|int() %}
@@ -28,7 +28,7 @@
      {% else %}
         <span id="server-group-{{s.0}}" style="display: none;">{{user_group}}</span>
      {% endif %}
-    <td>
+    <td style="width: 10%">
         {% if s.3 == 'do' %}
             DigitalOcean
             {% set onclickEditAction = 'editDoServer' %}
@@ -38,19 +38,19 @@
         {% endif %}
         <span id="server-cloud-{{s.0}}" style="display: none;">{{s.3}}</span>
     </td>
-    <td>
+    <td style="width: 10%">
         {{s.8}}
     </td>
-    <td>
+    <td style="width: 10%">
         <span id="sever-os-{{s.0}}">{{s.9}}</span>
     </td>
-    <td>
+    <td style="width: 10%">
         <span id="sever-ip-{{s.0}}">{{s.10}}</span>
     </td>
-    <td>
+    <td style="width: 10%">
         <span id="sever-size-{{s.0}}">{{s.5}}</span>
     </td>
-    <td>
+    <td style="width: 5%">
         {% if s.6 == 'Created ' %}
         {% set style='сolor: green;' %}
         {% elif s.6 == 'Error ' %}
@@ -58,7 +58,7 @@
         {% endif %}
         <span id="sever-status-{{s.0}}" title="Last error: {{s.11}}" style="font-weight: bold;{{style}}">{{s.6}}</span>
     </td>
-    <td>
+    <td style="width: 100%">
         {{s.7}}
     </td>
     <td>

app/templates/provisioning.html

@@ -55,6 +55,8 @@
 					{% if role == 1 %}
 					<th>Group</th>
 					{% endif %}
+					<th>Created at</th>
+					<th>Edited at</th>
 					<th></th>
 					<th></th>
 				</tr>

inc/provisioning.css

@@ -60,4 +60,7 @@ progress::-moz-progress-bar {
 }
 .provisioning_table tr:last-of-type {
     border: none;
+}
+.first-collumn {
+    width: 15%;
 }

inc/provisioning.js

@@ -948,6 +948,7 @@ function doEditProviderSave() {
 				setTimeout(function() {
 					$( "#provider-"+id ).removeClass( "update" );
 				}, 2500 );
+                $('#provider-edited-date-'+id).text(returnFormatedDate())
 			} else if (data.indexOf('error:') != '-1') {
 				toastr.error(data);
 			}
@@ -996,6 +997,7 @@ function awsEditProviderSave() {
 			if(data == "ok ") {
 				$("#provider-name-"+id).text(new_name);
 				$("#provider-"+id).addClass( "update", 1000 );
+                $('#provider-edited-date-'+id).text(returnFormatedDate())
 				setTimeout(function() {
 					$( "#provider-"+id ).removeClass( "update" );
 				}, 2500 );
@@ -1377,4 +1379,9 @@ function doProvisiningServer() {
             }
         }
     } );
+}
+function returnFormatedDate() {
+    let date = new Date();
+    current_date = date.toISOString().slice(0,10)+' '+date.toTimeString().split(' ')[0]
+    return current_date
 }