From e05dd3859831fd6945bb36015ec9ae46cbe76725 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Fri, 26 Aug 2016 12:06:39 +0530
Subject: [PATCH 1/2] [fix] paging issues in listview (#2011)

---
 frappe/model/db_query.py                | 19 +++++++++----------
 frappe/public/js/frappe/ui/listing.html |  2 +-
 frappe/public/js/frappe/ui/listing.js   | 16 ++++++++++++----
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index 7b634e6ce7..7800b71823 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -11,7 +11,7 @@ import frappe.permissions
 from frappe.utils import flt, cint, getdate, get_datetime, get_time, make_filter_tuple, get_filter
 from frappe import _
 from frappe.model import optional_fields
-from frappe.model.utils.list_settings import update_list_settings
+from frappe.model.utils.list_settings import get_list_settings, update_list_settings
 
 class DatabaseQuery(object):
 	def __init__(self, doctype):
@@ -492,14 +492,13 @@ class DatabaseQuery(object):
 
 	def update_list_settings(self):
 		# update list settings if new search
-		if not cint(self.limit_start) or cint(self.limit_page_length) != 20:
-			list_settings = {
-				'filters': self.filters,
-				'limit': self.limit_page_length,
-				'order_by': self.order_by
-			}
-			if self.save_list_settings_fields:
-				list_settings['fields'] = self.fields
+		list_settings = json.loads(get_list_settings(self.doctype) or '{}')
+		list_settings['filters'] = self.filters
+		list_settings['limit'] = self.limit_page_length
+		list_settings['order_by'] = self.order_by
 
-			update_list_settings(self.doctype, list_settings)
+		if self.save_list_settings_fields:
+			list_settings['fields'] = self.fields
+
+		update_list_settings(self.doctype, list_settings)
 
diff --git a/frappe/public/js/frappe/ui/listing.html b/frappe/public/js/frappe/ui/listing.html
index 28c23f737e..44d57887f0 100644
--- a/frappe/public/js/frappe/ui/listing.html
+++ b/frappe/public/js/frappe/ui/listing.html
@@ -24,7 +24,7 @@
         </div>
 		<div class="result-list"></div>
 	</div>
-	<div class="list-paging-area" style="display: none;">
+	<div class="list-paging-area">
 		<div class="row">
 			<div class="col-xs-6">
 				<button class="btn btn-default btn-more btn-sm">{%= _more %}...</button>
diff --git a/frappe/public/js/frappe/ui/listing.js b/frappe/public/js/frappe/ui/listing.js
index 323fe91a05..6b1bb79114 100644
--- a/frappe/public/js/frappe/ui/listing.js
+++ b/frappe/public/js/frappe/ui/listing.js
@@ -92,16 +92,24 @@ frappe.ui.Listing = Class.extend({
 
 		// next page
 		this.$w.find('.btn-more').click(function() {
-			me.run({append: true });
+			me.run(true);
 		});
 
 		this.$w.find(".btn-group-paging .btn").click(function() {
 			me.page_length = cint($(this).attr("data-value"));
 			me.$w.find(".btn-group-paging .btn-info").removeClass("btn-info");
 			$(this).addClass("btn-info");
-			me.run({append: true});
+
+			// always reset when changing list page length
+			me.run();
 		});
 
+		// select the correct page length
+		if(this.opts.page_length != 20) {
+			this.$w.find(".btn-group-paging .btn-info").removeClass("btn-info");
+			this.$w.find(".btn-group-paging .btn[data-value='"+ this.opts.page_length +"']").addClass('btn-info');
+		}
+
 		// title
 		if(this.title) {
 			this.$w.find('h3').html(this.title).toggle(true);
@@ -297,7 +305,7 @@ frappe.ui.Listing = Class.extend({
 	render_results: function(r) {
 		if(this.start===0) this.clear();
 
-		this.$w.find('.list-paging-area, .list-loading').toggle(false);
+		this.$w.find('.btn-more, .list-loading').toggle(false);
 
 		if(r.message) {
 			r.values = this.get_values_from_response(r.message);
@@ -394,7 +402,7 @@ frappe.ui.Listing = Class.extend({
 	},
 	update_paging: function(values) {
 		if(values.length >= this.page_length) {
-			this.$w.find('.list-paging-area').toggle(true);
+			this.$w.find('.btn-more').toggle(true);
 			this.start += this.page_length;
 		}
 	},

From ac67e1d51e97a646fded93ade2aeb775fe570834 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Fri, 26 Aug 2016 13:11:05 +0600
Subject: [PATCH 2/2] bumped to version 7.0.29

---
 frappe/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index a193b9ee17..e4b77387d4 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template
 
-__version__ = "7.0.28"
+__version__ = "7.0.29"
 
 local = Local()