diff --git a/src/webui/static/app/acleditor.js b/src/webui/static/app/acleditor.js index 1b55fae6..f1dee2a6 100644 --- a/src/webui/static/app/acleditor.js +++ b/src/webui/static/app/acleditor.js @@ -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', diff --git a/src/webui/static/app/capmteditor.js b/src/webui/static/app/capmteditor.js index 469c5f2f..9503c599 100644 --- a/src/webui/static/app/capmteditor.js +++ b/src/webui/static/app/capmteditor.js @@ -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' ]); diff --git a/src/webui/static/app/chconf.js b/src/webui/static/app/chconf.js index 3a68d385..fcffbf31 100644 --- a/src/webui/static/app/chconf.js +++ b/src/webui/static/app/chconf.js @@ -134,6 +134,7 @@ tvheadend.chconf = function() { }, { header : "Name", dataIndex : 'name', + sortable: true, width : 150, editor : new fm.TextField({ allowBlank : false diff --git a/src/webui/static/app/cteditor.js b/src/webui/static/app/cteditor.js index 578c6182..414730ba 100644 --- a/src/webui/static/app/cteditor.js +++ b/src/webui/static/app/cteditor.js @@ -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' ]); diff --git a/src/webui/static/app/cwceditor.js b/src/webui/static/app/cwceditor.js index 05fa188a..52d82455 100644 --- a/src/webui/static/app/cwceditor.js +++ b/src/webui/static/app/cwceditor.js @@ -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' ]); diff --git a/src/webui/static/app/dvb.js b/src/webui/static/app/dvb.js index 36f614dd..6fd77aac 100644 --- a/src/webui/static/app/dvb.js +++ b/src/webui/static/app/dvb.js @@ -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' ]); diff --git a/src/webui/static/app/dvr.js b/src/webui/static/app/dvr.js index 50b1970d..aa7bfd4a 100644 --- a/src/webui/static/app/dvr.js +++ b/src/webui/static/app/dvr.js @@ -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, diff --git a/src/webui/static/app/iptv.js b/src/webui/static/app/iptv.js index fe07186c..60674228 100644 --- a/src/webui/static/app/iptv.js +++ b/src/webui/static/app/iptv.js @@ -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' ]); diff --git a/src/webui/static/app/tableeditor.js b/src/webui/static/app/tableeditor.js index a61e376a..c3a1972d 100644 --- a/src/webui/static/app/tableeditor.js +++ b/src/webui/static/app/tableeditor.js @@ -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({ diff --git a/src/webui/static/app/v4l.js b/src/webui/static/app/v4l.js index ee73d19c..d755d714 100644 --- a/src/webui/static/app/v4l.js +++ b/src/webui/static/app/v4l.js @@ -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' ]);