From 5fa57e95a34365e66d2ecd0a34f8f01e7cd69f8f Mon Sep 17 00:00:00 2001 From: Alvaro Campos Date: Fri, 25 Nov 2011 15:36:17 -0400 Subject: [PATCH] BUG 8051 Solucionado problema de adicion de calendarios en IE. --- .../engine/templates/admin/calendarEdit.js | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/workflow/engine/templates/admin/calendarEdit.js b/workflow/engine/templates/admin/calendarEdit.js index 3246dbdac..0b8a43068 100644 --- a/workflow/engine/templates/admin/calendarEdit.js +++ b/workflow/engine/templates/admin/calendarEdit.js @@ -248,9 +248,7 @@ Ext.onReady( function() { } var editor = new Ext.ux.grid.RowEditor( { - saveText: 'Update', - handler: function (){ - } + saveText: 'Update' } ); editor.on( { @@ -315,15 +313,11 @@ Ext.onReady( function() { var gridEachStartSecond = gridEachStartObject.getTime(); var gridEachEndSecond = gridEachEndObject.getTime(); - if(editorStartSecond<=gridEachStartSecond||editorStartSecond>=gridEachEndSecond) { - if(editorEndSecond<=gridEachStartSecond||editorEndSecond>=gridEachEndSecond) { - } - else { - dataExist = 'Off'; - } - } - else { - dataExist = 'Off'; + if((editorStartSecond > gridEachStartSecond)||(gridEachEndSecond>editorStartSecond)) + dataExist = 'Off'; + else{ + if(editorEndSecond>gridEachStartSecond||gridEachEndSecond>editorEndSecond) + dataExist = 'Off'; } } } @@ -334,8 +328,6 @@ Ext.onReady( function() { e.start = gridStart; e.end = gridEnd; } - else { - } } } return; @@ -470,7 +462,7 @@ Ext.onReady( function() { var holidayArray = fields['HOLIDAY']; - console.info(holidayArray); + //console.info(holidayArray); for (i=0;i