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

diff --git a/src/webui/static/app/acleditor.js b/src/webui/static/app/acleditor.js
index 1b55fae6e93a5ad13f8942aac17ce00a28a7f9cb..f1dee2a6f30eb62f8aa063b2317b9bf54dba23d4 100644 (file)
--- 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 469c5f2fe5e0e789d5443d8c14a1e824d583d8e3..9503c599d758f83826048889e3bc7719b7261e24 100644 (file)
--- 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 3a68d385c68ecbb7d52e8324dd17b4fff35c0502..fcffbf31e6d72e8acc51e86676caa3135cbe6544 100644 (file)
--- 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 578c61827d5393b6371311deeb5f7b560ba7f9e6..414730ba31a4c42e3c7aa788f8334144423c34e5 100644 (file)
--- 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 05fa188aedb0f2a6d37602c1d053db979c396183..52d82455387f79b00f9fc7d1916291fa2110defc 100644 (file)
--- 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 36f614dd1b2bb4a413f34b64cbf88fb0921b03fb..6fd77aacd0b2e04202a29d0c54a2f9a3299d2009 100644 (file)
--- 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 50b1970d2f6f9620cf1fc9d2bdc13ca21b91a875..aa7bfd4a6fbd9d74453301eb2b89053b6e717ee6 100644 (file)
--- 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 fe07186cc4a5d9f717b235218b79e3217e3c0ba3..60674228ccc40e00d64c147cad27e5829d224213 100644 (file)
--- 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 a61e376aabb8533ca138faada2cdb03caaf6bfaf..c3a1972d178e3286301cf82ac79dfaea7148e5da 100644 (file)
--- 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 ee73d19c8d54ee836c3d3d2f311318567e46395c..d755d714fb839c63632e77712167bb7bf96eeb81 100644 (file)
--- 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' ]);