Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #2079 from Parpaing/2078-fix-for-CListView-and-CGr…

…idView-query-string-bug

Fix query string problem with CListView and CGridView
[ci skip]
  • Loading branch information...
commit 32b736352a3798a9344ce94261e2508693e5fc8d 2 parents 3b89c10 + a4decce
@mdomba mdomba authored
View
1  CHANGELOG
@@ -15,6 +15,7 @@ Version 1.1.14 work in progress
- Bug #1996: Using yiic help for commands with parameters with array as default value resulted in PHP error with latest PHP versions (dInGd0nG, samdark)
- Bug #2030: Fixed problem with MySQL 4.x: Undefined Index: Comment in CMysqlSchema (cebe)
- Bug #2049: CStatElement relation with join option throw exception when key-field present on joined table (Yiivgeny)
+- Bug #2078: Fixed problem with "undefined" parameter in query string when using CListView or CGridView with enableHistory (Parpaing)
- Enh: Better CFileLogRoute performance (Qiang, samdark)
- Enh #1847: Added COutputCache::varyByLanguage to generate separate cache for different languages (Obramko)
- Enh #1977: CFormatter::normalizeDateValue() now is protected instead of private to enable child classes to override it (etienneq)
View
2  framework/zii/widgets/assets/gridview/jquery.yiigridview.js
@@ -87,7 +87,7 @@
if (settings.enableHistory && window.History.enabled) {
// Ajaxify this link
var url = $(this).attr('href').split('?'),
- params = $.deparam.querystring('?'+url[1]);
+ params = $.deparam.querystring('?'+ (url[1] || ''));
delete params[settings.ajaxVar];
window.History.pushState(null, document.title, decodeURIComponent($.param.querystring(url[0], params)));
View
2  framework/zii/widgets/assets/listview/jquery.yiilistview.js
@@ -34,7 +34,7 @@
$(document).on('click.yiiListView', settings.updateSelector,function(){
if(settings.enableHistory && window.History.enabled) {
var url = $(this).attr('href').split('?'),
- params = $.deparam.querystring('?'+url[1]);
+ params = $.deparam.querystring('?'+ (url[1] || ''));
delete params[settings.ajaxVar];
window.History.pushState(null, document.title, decodeURIComponent($.param.querystring(url[0], params)));
Please sign in to comment.
Something went wrong with that request. Please try again.