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

Fix problems with sortable columns since ExtJS upgrade. Fixes #1245.

Browse source
This commit is contained in:
Adam Sutton 2012-09-23 21:06:27 +01:00
parent 76d981efaa
commit d6900ccafd
10 changed files with 41 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/webui/static/app/acleditor.js
View file

@ -37,7 +37,9 @@ tvheadend.acleditor = function() {
width : 100
});
var cm = new Ext.grid.ColumnModel([ enabledColumn, {
var cm = new Ext.grid.ColumnModel({
defaultSortable: true,
columns : [ enabledColumn, {
header : "Username",
dataIndex : 'username',
editor : new fm.TextField({
@ -63,7 +65,7 @@ tvheadend.acleditor = function() {
dataIndex : 'comment',
width : 400,
editor : new fm.TextField({})
} ]);
} ]});
var UserRecord = Ext.data.Record.create([ 'enabled', 'streaming', 'dvr',
'dvrallcfg', 'admin', 'webui', 'username', 'prefix', 'password',

6
src/webui/static/app/capmteditor.js
View file

@ -20,7 +20,9 @@ tvheadend.capmteditor = function() {
}
}
var cm = new Ext.grid.ColumnModel([ enabledColumn, {
var cm = new Ext.grid.ColumnModel({
defaultSortable: true,
columns: [ enabledColumn, {
header : "Camd.socket Filename",
dataIndex : 'camdfilename',
width : 200,
@ -50,7 +52,7 @@ tvheadend.capmteditor = function() {
return value;
},
editor : new fm.TextField()
} ]);
} ]});
var rec = Ext.data.Record.create([ 'enabled', 'connected', 'camdfilename',
'port', 'comment' ]);

1
src/webui/static/app/chconf.js
View file

@ -134,6 +134,7 @@ tvheadend.chconf = function() {
}, {
header : "Name",
dataIndex : 'name',
sortable: true,
width : 150,
editor : new fm.TextField({
allowBlank : false

6
src/webui/static/app/cteditor.js
View file

@ -22,7 +22,9 @@ tvheadend.cteditor = function() {
+ 'on top of logo.'
});
var cm = new Ext.grid.ColumnModel([ enabledColumn, {
var cm = new Ext.grid.ColumnModel({
defaultSortable: true,
columns : [ enabledColumn, {
header : "Name",
dataIndex : 'name',
editor : new fm.TextField({
@ -38,7 +40,7 @@ tvheadend.cteditor = function() {
dataIndex : 'comment',
width : 400,
editor : new fm.TextField({})
} ]);
} ]});
var ChannelTagRecord = Ext.data.Record.create([ 'enabled', 'name',
'internal', 'icon', 'comment', 'titledIcon' ]);

6
src/webui/static/app/cwceditor.js
View file

@ -32,7 +32,9 @@ tvheadend.cwceditor = function() {
}
}
var cm = new Ext.grid.ColumnModel([ enabledColumn, {
var cm = new Ext.grid.ColumnModel({
defaultSortable: true,
columns : [ enabledColumn, {
header : "Hostname",
dataIndex : 'hostname',
width : 200,
@ -93,7 +95,7 @@ tvheadend.cwceditor = function() {
return value;
},
editor : new fm.TextField()
} ]);
} ]});
var rec = Ext.data.Record.create([ 'enabled', 'connected', 'hostname',
'port', 'username', 'password', 'deskey', 'emm', 'emmex', 'comment' ]);

19
src/webui/static/app/dvb.js
View file

@ -81,8 +81,9 @@ tvheadend.dvb_muxes = function(adapterData, satConfStore) {
width : 50
}, qualityColumn);
var cm = new Ext.grid.ColumnModel(cmlist);
cm.defaultSortable = true;
var cm = new Ext.grid.ColumnModel({
columns: cmlist,
defaultSortable: true});
var rec = Ext.data.Record.create([ 'id', 'enabled', 'network', 'freq',
'pol', 'satconf', 'muxid', 'quality', 'fe_status', 'mod' ]);
@ -405,7 +406,9 @@ tvheadend.dvb_services = function(adapterId) {
} ]
});
var cm = new Ext.grid.ColumnModel([
var cm = new Ext.grid.ColumnModel({
defaultSortable: true,
columns: [
enabledColumn,
{
header : "Service name",
@ -501,9 +504,7 @@ tvheadend.dvb_services = function(adapterId) {
dataIndex : 'pcr',
width : 50,
hidden : true
}, actions ]);
cm.defaultSortable = true;
}, actions ]});
var store = new Ext.data.JsonStore({
root : 'entries',
@ -1265,7 +1266,9 @@ tvheadend.dvb_dummy = function(title) {
tvheadend.dvb_satconf = function(adapterId, lnbStore) {
var fm = Ext.form;
var cm = new Ext.grid.ColumnModel([ {
var cm = new Ext.grid.ColumnModel({
defaultSortable: true,
columns: [ {
header : "Name",
dataIndex : 'name',
width : 200,
@ -1298,7 +1301,7 @@ tvheadend.dvb_satconf = function(adapterId, lnbStore) {
dataIndex : 'comment',
width : 400,
editor : new fm.TextField()
} ]);
} ]});
var rec = Ext.data.Record.create([ 'name', 'port', 'comment', 'lnb' ]);

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

@ -410,7 +410,9 @@ tvheadend.autoreceditor = function() {
width : 30
});
var cm = new Ext.grid.ColumnModel(
var cm = new Ext.grid.ColumnModel({
defaultSortable: true,
columns :
[
enabledColumn,
{
@ -557,7 +559,7 @@ tvheadend.autoreceditor = function() {
editor : new fm.TextField({
allowBlank : false
})
} ]);
} ]});
return new tvheadend.tableEditor('Automatic Recorder', 'autorec', cm,
tvheadend.autorecRecord, [ enabledColumn ], tvheadend.autorecStore,

8
src/webui/static/app/iptv.js
View file

@ -41,7 +41,9 @@ tvheadend.iptv = function(adapterId) {
} ]
});
var cm = new Ext.grid.ColumnModel([
var cm = new Ext.grid.ColumnModel({
defaultSortable: true,
columns : [
enabledColumn,
{
header : "Channel name",
@ -128,9 +130,7 @@ tvheadend.iptv = function(adapterId) {
dataIndex : 'pcr',
width : 50,
hidden : true
}, actions ]);
cm.defaultSortable = true;
}, actions ]});
var rec = Ext.data.Record.create([ 'id', 'enabled', 'channelname',
'interface', 'group', 'port', 'sid', 'pmt', 'pcr', 'stype' ]);

1
src/webui/static/app/tableeditor.js
View file

@ -1,6 +1,5 @@
tvheadend.tableEditor = function(title, dtable, cm, rec, plugins, store,
helpContent, icon) {
cm.defaultSortable = true;
if (store == null) {
store = new Ext.data.JsonStore({

9
src/webui/static/app/v4l.js
View file

@ -113,7 +113,10 @@ tvheadend.v4l_services = function(adapterId) {
width : 45
});
var cm = new Ext.grid.ColumnModel([ enabledColumn, {
var cm = new Ext.grid.ColumnModel({
defaultSortable: true,
columns : [
enabledColumn, {
header : "Channel name",
dataIndex : 'channelname',
width : 150,
@ -138,9 +141,7 @@ tvheadend.v4l_services = function(adapterId) {
minValue : 10000,
maxValue : 1000000000
})
} ]);
cm.defaultSortable = true;
} ]});
var rec = Ext.data.Record.create([ 'id', 'enabled', 'channelname',
'frequency' ]);