Skip to content

Commit 793cce1

Browse files
committed
Update database. Some fixes for videowall screens
1 parent 3d06379 commit 793cce1

File tree

5 files changed

+143
-64
lines changed

5 files changed

+143
-64
lines changed
14.4 KB
Loading

agility/images/logos/es_cantell.png

36.7 KB
Loading

agility/scripts/common.js.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -898,8 +898,8 @@ function setupWorkingData(prueba,jornada,manga,callback) {
898898
}
899899
}).always(function() {
900900
// obtenemos datos de la manga
901-
if (manga<=0) {
902-
$.messager.alert('<?php _e("Error"); ?>', "No round information", "error");
901+
if (manga<=1) { // round:1 means not initialized yet; do not call server
902+
if(manga<=0) $.messager.alert('<?php _e("Error"); ?>', "No round id provided", "error");
903903
setManga(null);
904904
return false;
905905
}

agility/scripts/datagrid_formatters.js.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,8 @@ function formatVwTeamClasificaciones(value,rows) { return formatTeamClasificacio
506506
// repaint datagrid saving options, and load with empty data
507507
// WARNING !! DO NOT USE AS RESULT OF "OnLoadSuccess" (infinite loop)
508508
function resetDatagrid(dg,data) {
509-
if ( dg.length ==0) return; // to avoid try to reset undefined jquery objects
509+
if (typeof(dg==="undefined") || (dg===null)) return; // do nothing when non existent datagrid yet (i.e: init)
510+
if ( dg.length===0) return; // to avoid try to reset undefined jquery objects
510511
if (typeof(data)==="undefined") data={"total":0,"rows":[]};
511512
var opts=dg.datagrid('options');
512513
setTimeout(function(){

0 commit comments

Comments
 (0)