Skip to content

Commit d024b3f

Browse files
committed
fixes on updater. some cosmetic layout changes in frm:myadmin. new version/release
1 parent 3bdafc1 commit d024b3f

File tree

5 files changed

+18
-7
lines changed

5 files changed

+18
-7
lines changed

ChangeLog

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Version 4.5.1 20210712_1930
2+
- Fix: messager.password behavior ( do not fire onchange when focus lost )
3+
- Fix: updater should handle new naming convention from github
4+
- New: show version and release on top right of screen
5+
- New: ctrl-upgrade to force release upgrade regardless version
16
Version 4.5.0 20210707_1745
27
- Fix: Bugs in OrdenSalida,Results, and Training excel imports
38
Version 4.5.0 20210706_1920

agility/console/dialogs/dlg_tools.inc

+4-1
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@
3434
</p>
3535
<p>
3636
<span style="display:inline-block;width:350px"><?php _e('Search for updates'); ?></span>
37+
<!-- onclick event added later to track ctrl-meta keys -->
3738
<a id="tools-upgradeBtn" href="#" class="easyui-linkbutton" style="width:85px"
38-
data-options="iconCls:'icon-reload'" onclick="checkForUpgrades()"><?php _e('Upgrade')?></a>
39+
data-options="iconCls:'icon-reload'"><?php _e('Upgrade')?></a>
3940
</p>
4041
<p>
4142
<span style="display:inline-block;width:350px"><?php _e('Synchronize database with server'); ?></span>
@@ -105,6 +106,8 @@ addTooltip($('#tools-logResetBtn').linkbutton(),'<?php _e("Clear debugging and t
105106
addTooltip($('#tools-logViewBtn').linkbutton(),'<?php _e("Download debug and trace file"); ?>');
106107
addTooltip($('#tools-emptyTrashBtn').linkbutton(),'<?php _e("Remove every unneeded files from temporary directory"); ?>');
107108

109+
// bind click button to track ctrl and meta keys
110+
$('#tools-upgradeBtn').bind('click',function(e){checkForUpgrades(e);});
108111
// disable some buttons when running in server
109112
if (checkForServer()) {
110113
$('#tools-restoreBtn').linkbutton('disable'); // disable restore from app. use mysqldump'ed files to force reindexes

agility/console/frm_myAdmin.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
$config =Config::getInstance();
2222
?>
2323

24-
<img class="mainpage" src="../ajax/images/getRandomImage.php" alt="wallpaper" width="700" height="480" align="middle" />
24+
<img class="mainpage" src="../ajax/images/getRandomImage.php" alt="wallpaper" width="600" height="480" align="middle" />
2525

2626
<!-- FORMULARIO DE introduccion de usuario y contrasenya -->
2727
<div id="myAdmin-window" style="position:relative;width:750px;height:auto;padding:10px 10px">

agility/scripts/admin.js.php

+6-3
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,8 @@ function getProgress(){
723723
setTimeout(getProgress,2000);
724724
}
725725

726-
function checkForUpgrades() {
726+
// e: click event. Ctrl-key means force update
727+
function checkForUpgrades(e) {
727728
var msg="<p>"+'<?php _e("Current Version"); ?>'+": "+ac_config.version_name+"<br />"+'<?php _e("Current Release"); ?>'+": "+ac_config.version_date+"</p>";
728729
$.ajax({
729730
url:"../ajax/adminFunctions.php",
@@ -736,12 +737,14 @@ function checkForUpgrades() {
736737
$.messager.alert('<?php _e("Check for Upgrades"); ?>',data.errorMsg,"error");
737738
return;
738739
}
739-
if (data.version_date==ac_config.version_date) {
740+
if (data.version_date===ac_config.version_date) {
740741
msg = msg +'<p style="text-align:center;">'+"<?php _e('AgilityContest is up to date'); ?>"+"</p>";
741742
$.messager.alert("Version Info",msg,"info");
742743
}
743744
msg = msg +"<p>"+'<?php _e("Last Version"); ?>'+": "+data.version_name+"<br />"+'<?php _e('Last Release');?>'+": "+data.version_date+"</p>";
744-
if (data.version_date>ac_config.version_date) askForUpgrade(msg,data.version_name,data.version_date);
745+
if (data.version_date>ac_config.version_date) { askForUpgrade(msg,data.version_name,data.version_date); return; }
746+
// also, on ctrl/meta key force askforupgrade
747+
if (e.ctrlKey || e.metaKey) askForUpgrade(msg,data.version_name,data.version_date);
745748
}
746749
});
747750
}

config/system.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ program_name = "AgilityContest"
33
author = "Juan Antonio Martinez"
44
email = "juansgaviota@gmail.com"
55
license = "GPL"
6-
version_name = "4.5.0"
7-
version_date = "20210707_1745"
6+
version_name = "4.5.1"
7+
version_date = "20210712_1930"
88
database_name = "agility"
99
database_host = "localhost"
1010
database_user = "YWdpbGl0eV9vcGVyYXRvcg=="

0 commit comments

Comments
 (0)