Global setting for 'Items per page'

diff --git a/docs/property/page_size.md b/docs/property/page_size.md
new file mode 100644 (file)
index 0000000..8e8229f
--- /dev/null
+++ b/docs/property/page_size.md
@@ -0,0 +1,11 @@
+:
+
+Option           | Description
+-----------------|------------
+**25**           | List 25 items per page.
+**50**           | List 50 items per page.
+**100**          | List 100 items per page.
+**200**          | List 200 items per page.
+**All**          | List all items on a single page.
+
+This setting can be overridden on a page-by-page basis using the drop-down box.

diff --git a/src/access.c b/src/access.c
index 1b0289a352949b5a26c0a0d316c12b67bc689a17..6015b14ee92c780f0bf02af6d3659513493eb933 100644 (file)
--- a/src/access.c
+++ b/src/access.c
@@ -1507,6 +1507,19 @@ theme_get_ui_list ( void *p, const char *lang )
   return strtab2htsmsg_str(tab, 1, lang);
 }
 
+htsmsg_t *
+page_size_get_ui_list ( void *p, const char *lang )
+{
+  static struct strtab tab[] = {
+    { "25",          25  },
+    { "50",          50  },
+    { "100",         100  },
+    { "200",         200  },
+    { N_("All"),     999999999 },
+  };
+  return strtab2htsmsg(tab, 1, lang);
+}
+
 static idnode_slist_t access_entry_class_change_slist[] = {
   {
     .id   = "change_rights",

diff --git a/src/access.h b/src/access.h
index 4035d25846d62f2995e24efa83d64d4939c79dcd..f85c7a3a798ace74b9af94ef011580a336cdad59 100644 (file)
--- a/src/access.h
+++ b/src/access.h
@@ -366,6 +366,7 @@ void access_done(void);
 htsmsg_t *language_get_list ( void *obj, const char *lang );
 htsmsg_t *language_get_ui_list ( void *obj, const char *lang );
 htsmsg_t *theme_get_ui_list ( void *obj, const char *lang );
+htsmsg_t *page_size_get_ui_list ( void *obj, const char *lang );
 htsmsg_t *user_get_userlist ( void *obj, const char *lang );
 
 #endif /* ACCESS_H_ */

diff --git a/src/config.c b/src/config.c
index a8b853d453b4f9fd68e2b3f79439d57ffbf5b255..d8000085b06e188b5b26b2b21fc2113c8c237f64 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -1780,6 +1780,7 @@ config_boot
   config.hdhomerun_ip = strdup("");
   config.local_ip = strdup("");
   config.local_port = 0;
+  config.page_size_ui = 50;
 
   /* Generate default */
   if (!path)
@@ -2164,6 +2165,7 @@ PROP_DOC(config_picon_path)
 PROP_DOC(config_picon_servicetype)
 PROP_DOC(viewlevel_config)
 PROP_DOC(themes)
+PROP_DOC(page_size)
 
 const idclass_t config_class = {
   .ic_snode      = &config.idnode,
@@ -2259,6 +2261,17 @@ const idclass_t config_class = {
       .opts   = PO_DOC_NLIST,
       .group  = 2
     },
+    {
+      .type   = PT_U32,
+      .id     = "page_size_ui",
+      .name   = N_("Items per page"),
+      .desc   = N_("The default web interface items per page."),
+      .doc    = prop_doc_page_size,
+      .list   = page_size_get_ui_list,
+      .off    = offsetof(config_t, page_size_ui),
+      .opts   = PO_DOC_NLIST,
+      .group  = 2
+    },
     {
       .type   = PT_BOOL,
       .id     = "ui_quicktips",

diff --git a/src/config.h b/src/config.h
index 5ae12e8c9b48d85ef4a82b2e307e98d6343696cc..cc3afc46a8cf721c9031c82057d8acaf8020cd4f 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -83,6 +83,7 @@ typedef struct config {
 #if ENABLE_VAAPI
   int enable_vainfo;
   #endif
+  uint32_t page_size_ui;
 } config_t;
 
 extern const idclass_t config_class;

diff --git a/src/webui/comet.c b/src/webui/comet.c
index b4c9c8fe552d03eeb22a72e8243ece542c8a7b22..def64844b351cbc177dc78ec4a0dcd2ba08c47f1 100644 (file)
--- a/src/webui/comet.c
+++ b/src/webui/comet.c
@@ -180,6 +180,7 @@ comet_access_update(http_connection_t *hc, comet_mailbox_t *cmb)
     }
   }
   htsmsg_add_str(m, "theme", access_get_theme(hc->hc_access));
+  htsmsg_add_u32(m, "page_size", config.page_size_ui);
   htsmsg_add_u32(m, "quicktips", config.ui_quicktips);
   htsmsg_add_u32(m, "chname_num", config.chname_num);
   htsmsg_add_u32(m, "chname_src", config.chname_src);

diff --git a/src/webui/static/app/config.js b/src/webui/static/app/config.js
index b978a0a282994e562ce89736fea2696be088e933..f61d989a42352fec097622e3511f94bc7ec90008 100644 (file)
--- a/src/webui/static/app/config.js
+++ b/src/webui/static/app/config.js
@@ -44,7 +44,10 @@ tvheadend.baseconf = function(panel, index) {
             var n = data['theme_ui'];
             if (n !== tvheadend.theme)
               reload = 1;
-            var n = data['uilevel_nochange'] ? true : false;
+            var n = data['page_size_ui'];
+            if (n !== tvheadend.page_size)
+            reload = 1;
+              var n = data['uilevel_nochange'] ? true : false;
             if (n !== tvheadend.uilevel_nochange)
                 reload = 1;
             var n = data['ui_quicktips'] ? true : false;

diff --git a/src/webui/static/app/idnode.js b/src/webui/static/app/idnode.js
index aee7bee4c558c3e7061a9efe524722632ad544a0..e76866c5c7ec6b436475a53c6e2a960980f0bac7 100644 (file)
--- a/src/webui/static/app/idnode.js
+++ b/src/webui/static/app/idnode.js
@@ -1741,6 +1741,8 @@ tvheadend.idnode_grid = function(panel, conf)
         if (conf.all) params['all'] = 1;
         if (conf.extraParams) conf.extraParams(params);
 
+        if(!params['limit']) params['limit'] = tvheadend.page_size;
+
         groupReader = new Ext.data.JsonReader({
             totalProperty: 'total',
             root: 'entries',
@@ -2036,7 +2038,7 @@ tvheadend.idnode_grid = function(panel, conf)
                 data: [[25, '25'], [50, '50'], [100, '100'],
                     [200, '200'], [999999999, _('All')]]
             }),
-            value: 50,
+            value: tvheadend.page_size,
             mode: 'local',
             forceSelection: false,
             triggerAction: 'all',

diff --git a/src/webui/static/app/tvheadend.js b/src/webui/static/app/tvheadend.js
index acdbbc7b832a5dcd90c2844a9a6d527cbba72aee..b18cfe11796b4f7086fd61984e1eaaaa63351a09 100644 (file)
--- a/src/webui/static/app/tvheadend.js
+++ b/src/webui/static/app/tvheadend.js
@@ -694,7 +694,7 @@ tvheadend.loading = function(on) {
 tvheadend.PagingToolbarConf = function(conf, title, auto, count)
 {
   conf.width = 50;
-  conf.pageSize = 50;
+  conf.pageSize = tvheadend.page_size;
   conf.displayInfo = true;
                     /// {0} start, {1} end, {2} total, {3} title
   conf.displayMsg = _('{3} {0} - {1} of {2}').replace('{3}', title);
@@ -1024,6 +1024,7 @@ function accessUpdate(o) {
     tvheadend.chname_src = o.chname_src ? 1 : 0;
     tvheadend.date_mask = o.date_mask;
     tvheadend.label_formatting = o.label_formatting ? true : false;
+    tvheadend.page_size = o.page_size;
 
     if (o.uilevel_nochange)
         tvheadend.uilevel_nochange = true;