fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 8051 Solucionado problema de adicion de calendarios en IE.

Browse Source
This commit is contained in:
Alvaro Campos
2011-11-25 15:36:17 -04:00
parent de958a06f3
commit 5fa57e95a3
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
workflow/engine/templates/admin/calendarEdit.js
View File

@@ -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<holidayArray.length;i++) {
holidayArrayName = holidayArray[i].CALENDAR_HOLIDAY_NAME;
@@ -551,7 +543,7 @@ Ext.onReady( function() {
sortable: true,
editor: {
xtype: 'textfield',
allowBlank: true,
allowBlank: true
}
},
{
@@ -566,7 +558,7 @@ Ext.onReady( function() {
xtype: 'datefield',
allowBlank: false,
minValue: '01/01/2006',
minText: 'Can\'t have a start date before of the 2006!',
minText: 'Can\'t have a start date before of the 2006!'
//maxValue: (new Date()).format('m/d/Y')
}
} ,