stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

WebUI: Duration filter - improved validation on autorec grid

Browse source
This commit is contained in:
Ian 2014-06-11 15:54:50 +01:00
parent dfd42b9204
commit 8aa7cb83a2
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/webui/static/app/dvr.js
View file

@ -517,8 +517,21 @@ Ext.apply(Ext.form.VTypes, {
durations: function(val,field) {
var thisvalue = field.getValue();
var othervalue = Ext.getCmp(field.otherfield).getValue();
// Return if otherfield isn't set yet
/*
* Workaround for extJS passing the display value instead of the raw value.
*
* Simply, see if we can find the value in the store label fields - if we can,
* over-write the passed (display) value with the lookup (raw) value. If we
* can't, we were passed a raw seconds value, so stick with that.
*/
var index = tvheadend.DurationStore.find('label', thisvalue);
if (index !== -1)
thisvalue = tvheadend.DurationStore.getById(index).data.value;
// Return if otherfield isn't set yet
if (!othervalue) return true;
// Return if we've changed min and it's <= existing max
@ -526,6 +539,7 @@ Ext.apply(Ext.form.VTypes, {
// Return if we've changed max and it's >= existing min
if (field.id == 'maxfield' && thisvalue >= othervalue) return true;
},
durationsText: 'Minimum duration must be more than the maximum'
});