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

v6.1.0.0 

Change log: https://roxy-wi.org/changelog.py#6_1
pull/328/head
Pavel Loginov 2022-06-18 10:49:42 +03:00
parent d80eaffd9c
commit 550989a63f
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/ajax/load_services.html
View File

@ -14,7 +14,7 @@
</td>
<td class="padding10 first-collumn">
{% if 'is not installed' in s.3 %}
<a href="https://roxy-wi.org/services.py?service={{s.0.split('-')[2]}}#installation" title="{{s.0.split('-')[2]}} installation" target="_blank" class="link">Read about installation</a>
<a class="ui-button ui-widget ui-corner-all" onclick="updateService('{{s.0}}', 'install')" title="Install {{service_name}}">Install</a>
{% else %}
<a id="start-{{ s.0 }}" class="start" title="Start and enable {{s.0}} service">
<span class="service-start" onclick="confirmAjaxServiceAction('start', '{{s.0}}')"></span>

4
app/templates/ajax/load_updatehapwi.html
View File

@ -123,10 +123,10 @@
<td>
{% if 'is not installed' not in s.3 and s.3 != '' %}
{% if is_need_update %}
<a class="ui-button ui-widget ui-corner-all" onclick="updateService('{{s.0}}', 'install')" title="Update {{service_name}}">Update</a>
<a class="ui-button ui-widget ui-corner-all" onclick="updateService('{{s.0}}')" title="Update {{service_name}}">Update</a>
{% endif %}
{% else %}
<a class="ui-button ui-widget ui-corner-all" onclick="updateService('{{s.0}}')" title="Install {{service_name}}">Install</a>
<a class="ui-button ui-widget ui-corner-all" onclick="updateService('{{s.0}}', 'install')" title="Install {{service_name}}">Install</a>
{% endif %}
</td>
<td colspan="2">

12
inc/users.js
View File

@ -2329,18 +2329,16 @@ function updateService(service, action='update') {
type: "POST",
success: function( data ) {
data = data.replace(/\s+/g,' ');
if (data.indexOf('error:') != '-1' || data.indexOf('Failed') != '-1') {
toastr.error(data);
} else if (data.indexOf('Complete!') != '-1' || data.indexOf('Unpacking') != '-1'){
if (data.indexOf('Complete!') != '-1' || data.indexOf('Unpacking') != '-1'){
toastr.clear();
toastr.success(service + ' has been '+action+'ed');
} else if (data.indexOf('Unauthorized') != '-1') {
} else if (data.indexOf('Unauthorized') != '-1' || data.indexOf('Status code: 401') != '-1') {
toastr.clear();
toastr.error('It seems like Unauthorized in the Roxy-WI repository. How to get Roxy-WI auth you can read <b><a href="https://roxy-wi.org/installation.py" title="How to get Roxy-WI auth">hear</a></b>');
toastr.error('It looks like there is no authorization in the Roxy-WI repository. Your subscription may have expired or there is no subscription. How to get the <b><a href="https://roxy-wi.org/pricing.py" title="Pricing" target="_blank">subscription</a></b>');
} else if (data.indexOf('but not installed') != '-1') {
toastr.clear();
toastr.error('There is setting for Roxy-WI repository, but Roxy-WI is installed without repository. Please reinstall with package manager');
} else if (data.indexOf('No Match for argument') != '-1') {
} else if (data.indexOf('No Match for argument') != '-1' || data.indexOf('Unable to find a match') != '-1') {
toastr.clear();
toastr.error('It seems like Roxy-WI repository is not set. Please read docs for <b><a href="https://roxy-wi.org/updates.py">detail</a></b>');
} else if (data.indexOf('password for') != '-1') {
@ -2361,6 +2359,8 @@ function updateService(service, action='update') {
} else if (data.indexOf('conflicts with file from') != '-1') {
toastr.clear();
toastr.error(data);
} else if (data.indexOf('error:') != '-1' || data.indexOf('Failed') != '-1') {
toastr.error(data);
}
$("#ajax-update").html('');
loadupdatehapwi();